Fix harmless compiler warnings and one macro VVA_ONLY macro usage issue.

FossilOrigin-Name: bcc8a75509aafda61feb6dcc074668c79611a662

diff --git a/manifest b/manifest
index 0c81483a9be5c2b82a3933aa3b5b8dfba9d4711c..dfc7d5e26afe2d5def1a0e85769af4e268ad7d73 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Simplify\sFTS5\shandling\sin\sthe\sMSVC\smakefile.
-D 2015-07-02T16:50:43.673
+C Fix\sharmless\scompiler\swarnings\sand\sone\smacro\sVVA_ONLY\smacro\susage\sissue.
+D 2015-07-02T16:52:01.447
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 1f525f24e2d3a4defd0ce819c10980caeec967fe
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -269,7 +269,7 @@ F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
 F src/backup.c 4d9134dc988a87838c06056c89c0e8c4700a0452
 F src/bitvec.c d1f21d7d91690747881f03940584f4cc548c9d3d
 F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
-F src/btree.c 6368ffd4c5a5e84ec480e23ad6f4fcdac7c3882d
+F src/btree.c cf3375bf706d15d3b8b7ac1fc86b0bf5603324d5
 F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
 F src/btreeInt.h 2ad754dd4528baa8d0946a593cc373b890bf859e
 F src/build.c b3f15255d5b16e42dafeaa638fd4f8a47c94ed70
@@ -327,7 +327,7 @@ F src/printf.c db11b5960105ee661dcac690f2ae6276e49bf251
 F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 F src/resolve.c 2d47554370de8de6dd5be060cef9559eec315005
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
-F src/select.c 009c6138be8788449d4f911f380d99e8608040e2
+F src/select.c 7003fe663bc0636b656874440845a85dcbad4ba7
 F src/shell.c 8af3cced094aebb5f57a8ad739b9dafc7867eed7
 F src/sqlite.h.in 76d2f5637eb795b6300d9dd3c3ec3632ffafd721
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
@@ -1364,7 +1364,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 3a26a919fd5550e5a0053a48cb93a27bb95cc916
-R 19651ea83adcb4d525e3ac0569c1fb03
+P f022e04343fc166a71b315d5aabbc5cc075a4767
+R 5c911bb6fc3e16cbfd6e76bce0768816
 U mistachkin
-Z 09efa0bc8e44f82df4002070e7088d11
+Z 616700ef04b7deb7995d1138c3fd92ed

diff --git a/manifest.uuid b/manifest.uuid
index 6990e76c326310b55dda2660a730b0fca10484cd..e4a6a044937542b850e9e3479b97dd328708c629 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f022e04343fc166a71b315d5aabbc5cc075a4767
\ No newline at end of file
+bcc8a75509aafda61feb6dcc074668c79611a662
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 8e92c90424ce8e026912cc19718994cf3c623bed..ca0dd0e5962a68c8dd97e70c639465dedbe92b58 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -3589,7 +3589,7 @@ int sqlite3BtreeIncrVacuum(Btree *p){
 static int autoVacuumCommit(BtShared *pBt){
   int rc = SQLITE_OK;
   Pager *pPager = pBt->pPager;
-  VVA_ONLY( int nRef = sqlite3PagerRefcount(pPager) );
+  VVA_ONLY( int nRef = sqlite3PagerRefcount(pPager); )
 
   assert( sqlite3_mutex_held(pBt->mutex) );
   invalidateAllOverflowCache(pBt);
@@ -9116,9 +9116,9 @@ static int checkTreePage(
     i = get2byte(&data[hdr+1]);
     while( i>0 ){
       int size, j;
-      assert( i<=usableSize-4 );     /* Enforced by btreeInitPage() */
+      assert( (u32)i<=usableSize-4 );     /* Enforced by btreeInitPage() */
       size = get2byte(&data[i+2]);
-      assert( i+size<=usableSize );  /* Enforced by btreeInitPage() */
+      assert( (u32)(i+size)<=usableSize );  /* Enforced by btreeInitPage() */
       btreeHeapInsert(heap, (i<<16)|(i+size-1));
       /* EVIDENCE-OF: R-58208-19414 The first 2 bytes of a freeblock are a
       ** big-endian integer which is the offset in the b-tree page of the next
@@ -9128,7 +9128,7 @@ static int checkTreePage(
       /* EVIDENCE-OF: R-06866-39125 Freeblocks are always connected in order of
       ** increasing offset. */
       assert( j==0 || j>i+size );  /* Enforced by btreeInitPage() */
-      assert( j<=usableSize-4 );   /* Enforced by btreeInitPage() */
+      assert( (u32)j<=usableSize-4 );   /* Enforced by btreeInitPage() */
       i = j;
     }
     /* Analyze the min-heap looking for overlap between cells and/or 

diff --git a/src/select.c b/src/select.c
index bb8bdd42b844e4627a6a09eff36fe06f245837a5..ed5d2c6bf4bd08bed8e87a797f338efce9171ef8 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -4769,7 +4769,7 @@ int sqlite3Select(
   WhereInfo *pWInfo;     /* Return from sqlite3WhereBegin() */
   Vdbe *v;               /* The virtual machine under construction */
   int isAgg;             /* True for select lists like "count(*)" */
-  ExprList *pEList;      /* List of columns to extract. */
+  ExprList *pEList = 0;  /* List of columns to extract. */
   SrcList *pTabList;     /* List of tables to select from */
   Expr *pWhere;          /* The WHERE clause.  May be NULL */
   ExprList *pGroupBy;    /* The GROUP BY clause.  May be NULL */