/ Check-in [e7d2ec04]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix harmless compiler warnings.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:e7d2ec048c88237c124fbe598f8f7e950d43d90f
User & Date: mistachkin 2015-01-27 21:24:33
Context
2015-01-29
11:52
Optimize range constraints on the rowid column of fts3/4 tables even if there is no MATCH clause in the query. check-in: 85dc1262 user: dan tags: trunk
02:26
Experimental sqlite_db_config() setting to disable writing to all btrees except for one btree with a particular root page. check-in: 23054110 user: drh tags: one-writable-btree
2015-01-28
12:00
Merge in all changes from trunk. check-in: 17c69be8 user: drh tags: ota-update
2015-01-27
21:24
Fix harmless compiler warnings. check-in: e7d2ec04 user: mistachkin tags: trunk
19:01
Fix a bug in the fts3 snippet() function causing it to omit leading separator characters from snippets that begin with the first token in a column. check-in: adc9283d user: dan tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to ext/fts3/fts3.c.

  5652   5652     }
  5653   5653   
  5654   5654     iDocid = pExpr->iDocid;
  5655   5655     pIter = pPhrase->doclist.pList;
  5656   5656     if( iDocid!=pCsr->iPrevId || pExpr->bEof ){
  5657   5657       int rc = SQLITE_OK;
  5658   5658       int bDescDoclist = pTab->bDescIdx;      /* For DOCID_CMP macro */
  5659         -    int iMul;                     /* +1 if csr dir matches index dir, else -1 */
  5660   5659       int bOr = 0;
  5661   5660       u8 bEof = 0;
  5662   5661       u8 bTreeEof = 0;
  5663   5662       Fts3Expr *p;                  /* Used to iterate from pExpr to root */
  5664   5663       Fts3Expr *pNear;              /* Most senior NEAR ancestor (or pExpr) */
  5665   5664   
  5666   5665       /* Check if this phrase descends from an OR expression node. If not, 

Changes to src/shell.c.

   109    109   /* On Windows, we normally run with output mode of TEXT so that \n characters
   110    110   ** are automatically translated into \r\n.  However, this behavior needs
   111    111   ** to be disabled in some cases (ex: when generating CSV output and when
   112    112   ** rendering quoted strings that contain \n characters).  The following
   113    113   ** routines take care of that.
   114    114   */
   115    115   #if defined(_WIN32) || defined(WIN32)
   116         -static setBinaryMode(FILE *out){
          116  +static void setBinaryMode(FILE *out){
   117    117     fflush(out);
   118    118     _setmode(_fileno(out), _O_BINARY);
   119    119   }
   120         -static setTextMode(FILE *out){
          120  +static void setTextMode(FILE *out){
   121    121     fflush(out);
   122    122     _setmode(_fileno(out), _O_TEXT);
   123    123   }
   124    124   #else
   125    125   # define setBinaryMode(X)
   126    126   # define setTextMode(X)
   127    127   #endif