/ Check-in [7dd97f12]
Login

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

Overview
Comment:Avoid a compiler warning (an incorrect compiler warning, at that) in vs2010.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 7dd97f12cd268cac1241f0f3e8de94bb629b97c7
User & Date: drh 2012-03-19 14:28:43
Context
2012-03-19
14:51
Suppress harmless compiler warnings on windows in FTS4 and RTREE. check-in: 4fd68647 user: drh tags: trunk
14:28
Avoid a compiler warning (an incorrect compiler warning, at that) in vs2010. check-in: 7dd97f12 user: drh tags: trunk
10:21
Ensure that compatible malloc and free functions are used with stat3 data if SQLITE_ENABLE_STAT3 is defined. check-in: 32bb1ece user: dan tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to ext/fts3/fts3.c.

1219
1220
1221
1222
1223
1224
1225
1226

1227
1228
1229
1230
1231
1232
1233

      /* If a languageid= option was specified, remove the language id
      ** column from the aCol[] array. */ 
      if( rc==SQLITE_OK && zLanguageid ){
        int j;
        for(j=0; j<nCol; j++){
          if( sqlite3_stricmp(zLanguageid, aCol[j])==0 ){
            memmove(&aCol[j], &aCol[j+1], (nCol-j) * sizeof(aCol[0]));

            nCol--;
            break;
          }
        }
      }
    }
  }







|
>







1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234

      /* If a languageid= option was specified, remove the language id
      ** column from the aCol[] array. */ 
      if( rc==SQLITE_OK && zLanguageid ){
        int j;
        for(j=0; j<nCol; j++){
          if( sqlite3_stricmp(zLanguageid, aCol[j])==0 ){
            int k;
            for(k=j; k<nCol; k++) aCol[k] = aCol[k+1];
            nCol--;
            break;
          }
        }
      }
    }
  }