Fix some more harmless compiler warnings.

FossilOrigin-Name: 18f531e1cf3c8bb986d912c9c5e3f5698360c93e

diff --git a/ext/fts3/tool/fts3view.c b/ext/fts3/tool/fts3view.c
index 6dada352b3a49fa02460aeeeac125e0f3e492984..a8d7981af00d48eba6191b262640517e9a24a886 100644 (file)
--- a/ext/fts3/tool/fts3view.c
+++ b/ext/fts3/tool/fts3view.c
@@ -398,7 +398,7 @@ static void showSegmentStats(sqlite3 *db, const char *zTab){
     if( sqlite3_step(pStmt)==SQLITE_ROW
      && (nLeaf = sqlite3_column_int(pStmt, 0))>0
     ){
-      int nIdx = sqlite3_column_int(pStmt, 5);
+      nIdx = sqlite3_column_int(pStmt, 5);
       sqlite3_int64 sz;
       printf("For level %d:\n", i);
       printf("  Number of indexes...................... %9d\n", nIdx);

diff --git a/manifest b/manifest
index a6a443ee80d7d751955872118e0b95e150c821e1..076eea4893734a77ce523b4bebbfdc94bf6c82e7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\scompiler\swarning\sseen\swith\sMSVC.
-D 2015-12-16T21:09:53.083
+C Fix\ssome\smore\sharmless\scompiler\swarnings.
+D 2015-12-16T22:06:52.804
 F Makefile.in 28bcd6149e050dff35d4dcfd97e890cd387a499d
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e8fdca1cb89a1b58b5f4d3a130ea9a3d28cb314d
@@ -90,7 +90,7 @@ F ext/fts3/fts3_unicode2.c c3d01968d497bd7001e7dc774ba75b372738c057
 F ext/fts3/fts3_write.c f442223e4a1914dc1fc12b65af7e4f2c255fa47c
 F ext/fts3/fts3speed.tcl b54caf6a18d38174f1a6e84219950d85e98bb1e9
 F ext/fts3/mkfts3amal.tcl 252ecb7fe6467854f2aa237bf2c390b74e71f100
-F ext/fts3/tool/fts3view.c 8e53d0190a7b3443764bbd32ad47be2bd852026d
+F ext/fts3/tool/fts3view.c 5d78b668f4e9598af9147f8999632599fb0d9dd5
 F ext/fts3/unicode/CaseFolding.txt 8c678ca52ecc95e16bc7afc2dbf6fc9ffa05db8c
 F ext/fts3/unicode/UnicodeData.txt cd07314edb62d49fde34debdaf92fa2aa69011e7
 F ext/fts3/unicode/mkunicode.tcl 95cf7ec186e48d4985e433ff8a1c89090a774252
@@ -263,7 +263,7 @@ F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
 F mptest/crash02.subtest f4ef05adcd15d60e5d2bd654204f2c008b519df8
-F mptest/mptest.c e7b499cb0cf8c3de65eaf24dec9b36daa4e013e4
+F mptest/mptest.c 0d3f2eb8e373cb692ab362a6dddedd53e0978502
 F mptest/multiwrite01.test dab5c5f8f9534971efce679152c5146da265222d
 F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
@@ -350,7 +350,7 @@ F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
 F src/test5.c 5a34feec76d9b3a86aab30fd4f6cc9c48cbab4c1
 F src/test6.c 41cacf3b0dd180823919bf9e1fbab287c9266723
 F src/test7.c 9c89a4f1ed6bb13af0ed805b8d782bd83fcd57e3
-F src/test8.c b3a416298dab54537d5aec68697a8b31f5ddf69c
+F src/test8.c fa262391d3edea6490a71bfaa8fed477ccbbac75
 F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60
 F src/test_async.c 21e11293a2f72080eda70e1124e9102044531cd8
 F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
@@ -367,7 +367,7 @@ F src/test_init.c 66b33120ffe9cd853b5a905ec850d51151337b32
 F src/test_intarray.c 870124b95ec4c645d4eb84f15efb7133528fb1a5
 F src/test_intarray.h 9dc57417fb65bc7835cc18548852cc08cc062202
 F src/test_journal.c 5360fbe1d1e4416ca36290562fd5a2e3f70f32aa
-F src/test_loadext.c a5251f956ab6af21e138dc1f9c0399394a510cb4
+F src/test_loadext.c 337056bae59f80b9eb00ba82088b39d0f4fe6dfd
 F src/test_malloc.c 96df9381a1ff1f6d3805ff7231b9baf1386aaabf
 F src/test_multiplex.c 6a088d8d9d4aad4bec45dd8878af11b15900702d
 F src/test_multiplex.h c08e4e8f8651f0c5e0509b138ff4d5b43ed1f5d3
@@ -1380,7 +1380,7 @@ F tool/replace.tcl 7727c60a04299b65a92f5e1590896fea0f25b9e0
 F tool/restore_jrnl.tcl 6957a34f8f1f0f8285e07536225ec3b292a9024a
 F tool/rollback-test.c 9fc98427d1e23e84429d7e6d07d9094fbdec65a5
 F tool/run-speed-test.sh 0ae485af4fe9f826e2b494be8c81f8ca9e222a4a
-F tool/showdb.c d4476e000a64eca9f5e2c2f68741e747b9778e8d
+F tool/showdb.c 82dca79a999b2701c62417636345e9974151fdad
 F tool/showjournal.c 5bad7ae8784a43d2b270d953060423b8bd480818
 F tool/showlocks.c 9920bcc64f58378ff1118caead34147201f48c68
 F tool/showstat4.c bda40d6e395df7edb6e9ea630784d3d762c35b4b
@@ -1404,10 +1404,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P f2fc3aede55c8fa0351697f9f5ce4e544334c9af
-R 454ea4523afc8cf1e644fcd8a292a415
-T *branch * msvcWarn
-T *sym-msvcWarn *
-T -sym-trunk *
+P 18a4c0540bf4f02335e9e9def1f2b0d4d784ef08
+R 06de55492a4df78b9664135b3d4b8e56
 U mistachkin
-Z 09fa8646fa5564b4cacb5dabca0e4ae2
+Z 864a907ebf41c0671e45c9ca5fad89fc

diff --git a/manifest.uuid b/manifest.uuid
index f03db546f9b79c0ce43cd940041b167af5e0a461..1112c6c5f01d00eec15dfc562c22637f13322841 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-18a4c0540bf4f02335e9e9def1f2b0d4d784ef08
\ No newline at end of file
+18f531e1cf3c8bb986d912c9c5e3f5698360c93e
\ No newline at end of file

diff --git a/mptest/mptest.c b/mptest/mptest.c
index 5a9c8bf6b4e56b527eb6b06f841f5f26d847d322..b29ebdc9e110fff92ca6bd4e3cea590318934977 100644 (file)
--- a/mptest/mptest.c
+++ b/mptest/mptest.c
@@ -422,9 +422,9 @@ static void stringAppend(String *p, const char *z, int n){
   if( n<0 ) n = (int)strlen(z);
   if( p->n+n>=p->nAlloc ){
     int nAlloc = p->nAlloc*2 + n + 100;
-    char *z = sqlite3_realloc(p->z, nAlloc);
-    if( z==0 ) fatalError("out of memory");
-    p->z = z;
+    char *zNew = sqlite3_realloc(p->z, nAlloc);
+    if( zNew==0 ) fatalError("out of memory");
+    p->z = zNew;
     p->nAlloc = nAlloc;
   }
   memcpy(p->z+p->n, z, n);

diff --git a/src/test8.c b/src/test8.c
index 3e506e36b44152177df3c6eb55b864554be51ae9..fb781ac8fdd02b8ad77ab291ce5589a7dc610196 100644 (file)
--- a/src/test8.c
+++ b/src/test8.c
@@ -863,7 +863,7 @@ static int echoBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
 
     iCol = pConstraint->iColumn;
     if( iCol<0 || pVtab->aIndex[iCol] ){
-      char *zCol = iCol>=0 ? pVtab->aCol[iCol] : "rowid";
+      char *zNewCol = iCol>=0 ? pVtab->aCol[iCol] : "rowid";
       char *zOp = 0;
       useIdx = 1;
       switch( pConstraint->op ){
@@ -895,9 +895,9 @@ static int echoBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
       }
       if( zOp[0]=='L' ){
         zNew = sqlite3_mprintf(" %s %s LIKE (SELECT '%%'||?||'%%')", 
-                               zSep, zCol);
+                               zSep, zNewCol);
       } else {
-        zNew = sqlite3_mprintf(" %s %s %s ?", zSep, zCol, zOp);
+        zNew = sqlite3_mprintf(" %s %s %s ?", zSep, zNewCol, zOp);
       }
       string_concat(&zQuery, zNew, 1, &rc);
 
@@ -915,9 +915,9 @@ static int echoBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
         pIdxInfo->aOrderBy->iColumn<0 ||
         pVtab->aIndex[pIdxInfo->aOrderBy->iColumn]) ){
     int iCol = pIdxInfo->aOrderBy->iColumn;
-    char *zCol = iCol>=0 ? pVtab->aCol[iCol] : "rowid";
+    char *zNewCol = iCol>=0 ? pVtab->aCol[iCol] : "rowid";
     char *zDir = pIdxInfo->aOrderBy->desc?"DESC":"ASC";
-    zNew = sqlite3_mprintf(" ORDER BY %s %s", zCol, zDir);
+    zNew = sqlite3_mprintf(" ORDER BY %s %s", zNewCol, zDir);
     string_concat(&zQuery, zNew, 1, &rc);
     pIdxInfo->orderByConsumed = 1;
   }

diff --git a/src/test_loadext.c b/src/test_loadext.c
index 5a1f46da9cf87f675ff14ced5dd61bf3c785d230..6404a69714e44061bb698a40a27269e29d773b79 100644 (file)
--- a/src/test_loadext.c
+++ b/src/test_loadext.c
@@ -34,7 +34,7 @@ static void statusFunc(
   int argc,
   sqlite3_value **argv
 ){
-  int op, mx, cur, resetFlag, rc;
+  int op = 0, mx, cur, resetFlag, rc;
   if( sqlite3_value_type(argv[0])==SQLITE_INTEGER ){
     op = sqlite3_value_int(argv[0]);
   }else if( sqlite3_value_type(argv[0])==SQLITE_TEXT ){

diff --git a/tool/showdb.c b/tool/showdb.c
index 38b92f1f7d0c01fae44c84e700f8ca142f8fc9a5..06cd36cd2c86c552a44ceff802af8265a93dd81d 100644 (file)
--- a/tool/showdb.c
+++ b/tool/showdb.c
@@ -1152,10 +1152,10 @@ int main(int argc, char **argv){
       }else if( zLeft && zLeft[0]=='t' ){
         int detail = 0;
         int recursive = 0;
-        int i;
-        for(i=1; zLeft[i]; i++){
-          if( zLeft[i]=='r' ) recursive = 1;
-          if( zLeft[i]=='d' ) detail = 1;
+        int j;
+        for(j=1; zLeft[j]; j++){
+          if( zLeft[j]=='r' ) recursive = 1;
+          if( zLeft[j]=='d' ) detail = 1;
         }
         decode_trunk_page(iStart, detail, recursive);
         continue;