SQLite: Check-in [3899f3b9]

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

Overview

Comment:	Fix a couple of compiler warnings.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| broken-build
Files:	files \| file ages \| folders
SHA1:	3899f3b95ed50773a72d907b39b451fefce69c9e
User & Date:	drh 2011-06-15 12:43:36

Context

2011-06-15
13:02		Fix so that the TCL test harness works even if SQLITE_ENABLE_FTS is omitted. Closed-Leaf check-in: 63ebcb52 user: drh tags: broken-build
12:43		Fix a couple of compiler warnings. check-in: 3899f3b9 user: drh tags: broken-build
08:30		Add an interface to better test incremental loading of doclists by FTS4. Also some tests for this and term prefix queries. check-in: 7a381313 user: dan tags: broken-build

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to ext/fts3/fts3.c.

  3271   3271           return SQLITE_OK;
  3272   3272   
  3273   3273         }else if( aPoslist==0 ){
  3274   3274           aPoslist = pList;
  3275   3275           nPoslist = nList;
  3276   3276   
  3277   3277         }else{
  3278         -        assert( iPrev>=0 );
  3279         -
  3280   3278           char *aOut = pList;
  3281   3279           char *p1 = aPoslist;
  3282   3280           char *p2 = aOut;
  3283   3281   
         3282  +        assert( iPrev>=0 );
  3284   3283           fts3PoslistPhraseMerge(&aOut, iToken-iPrev, 0, 1, &p1, &p2);
  3285   3284           sqlite3_free(aPoslist);
  3286   3285           aPoslist = pList;
  3287   3286           nPoslist = aOut - aPoslist;
  3288   3287           if( nPoslist==0 ){
  3289   3288             sqlite3_free(aPoslist);
  3290   3289             pPhrase->doclist.pList = 0;

Changes to src/func.c.

   604    604         }
   605    605         return 0;
   606    606       }else if( !prevEscape && c==matchOne ){
   607    607         if( sqlite3Utf8Read(zString, &zString)==0 ){
   608    608           return 0;
   609    609         }
   610    610       }else if( c==matchSet ){
   611         -      int prior_c = 0;
          611  +      u32 prior_c = 0;
   612    612         assert( esc==0 );    /* This only occurs for GLOB, not LIKE */
   613    613         seen = 0;
   614    614         invert = 0;
   615    615         c = sqlite3Utf8Read(zString, &zString);
   616    616         if( c==0 ) return 0;
   617    617         c2 = sqlite3Utf8Read(zPattern, &zPattern);
   618    618         if( c2=='^' ){