More warning fixes.

FossilOrigin-Name: 51a6a797e1d61c4361b87cdf3467bfd3ce161cc3

diff --git a/manifest b/manifest
index f890a8019b797979eb1aa75d794e40671ace7b9c..ad74c6cc346bbc288abb9ff009c87a96536f0be8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings.
-D 2012-10-18T09:39:16.781
+C More\swarning\sfixes.
+D 2012-10-18T10:35:19.926
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5f4f26109f9d80829122e0e09f9cda008fa065fb
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -121,7 +121,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c cab40f2c1fe79d6eb93d3b4086c78c41ad2fa5d0
 F src/bitvec.c 26675fe8e431dc555e6f2d0e11e651d172234aa1
 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
-F src/btree.c 299377f0793038ad3ea322907fbda7fbea615094
+F src/btree.c eccee944cb2221e919d7a855e5928d8643194b14
 F src/btree.h 3ad7964d6c5b1c7bff569aab6adfa075f8bf06cd
 F src/btreeInt.h 4e5c2bd0f9b36b2a815a6d84f771a61a65830621
 F src/build.c f35dac52924a6e8e6346a90f0c195a84e28b6f21
@@ -135,7 +135,7 @@ F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 F src/fkey.c c82a04e7a92bb728f9ab972b76590403283be2af
 F src/func.c cbb90dc84b22eea25caf39528d342279e61b8898
 F src/global.c fb44b11e02e06c995e6ed6642509edd23599d584
-F src/hash.c a4031441741932da9e7a65bee2b36b5d0e81c073
+F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4
 F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
 F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
 F src/insert.c ad0d8943d2a4f0b52ebf75b9e459f2da00117dbd
@@ -189,7 +189,7 @@ F src/test2.c 4178056dd1e7d70f954ad8a1e3edb71a2a784daf
 F src/test3.c 3c3c2407fa6ec7a19e24ae23f7cb439d0275a60d
 F src/test4.c bf9fa9bece01de08e6f5e02314e4af5c13590dfa
 F src/test5.c a6d1ac55ac054d0b2b8f37b5e655b6c92645a013
-F src/test6.c b990d3cfa24d589afefb47bb86db3c4a56e5e7be
+F src/test6.c 938794c970ed6810036c8d28450ca28166524bf7
 F src/test7.c 2e0781754905c8adc3268d8f0967e7633af58843
 F src/test8.c 8bcce65e5ee027fbfd7da41d28371aabbfd369ff
 F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60
@@ -1021,10 +1021,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P b5f5ba3103e6fcf117fb69d5379fa70f691a652d
-R 39dbbb084ae6a161ccbba144af20810a
-T *branch * warnings
-T *sym-warnings *
-T -sym-trunk *
+P 018e09c70347b9e0c76246ae65d57ef5d29a965a
+R 118e249f38e185342e1ec7a1a462b9aa
 U mistachkin
-Z 2d0ade0fb9b94740b143c6669e1b62e9
+Z ad2a76d04895f240393670b919d80b4d

diff --git a/manifest.uuid b/manifest.uuid
index 01b958f9768a87818f3d3bcfa358dd4724d60a27..c57c558e36ff8043fa75f53ecfbec4c41a94447a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-018e09c70347b9e0c76246ae65d57ef5d29a965a
\ No newline at end of file
+51a6a797e1d61c4361b87cdf3467bfd3ce161cc3
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index c0cda1281b7f0ad0e38767d160de9ebca78f9cfa..246843b79e39fb86a5746fcc87fb953445a166ce 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -5744,7 +5744,7 @@ static int balance_quick(MemPage *pParent, MemPage *pPage, u8 *pSpace){
   assert( pPage->nOverflow==1 );
 
   /* This error condition is now caught prior to reaching this function */
-  if( pPage->nCell<=0 ) return SQLITE_CORRUPT_BKPT;
+  if( pPage->nCell==0 ) return SQLITE_CORRUPT_BKPT;
 
   /* Allocate a new page. This page will become the right-sibling of 
   ** pPage. Make the parent page writable, so that the new divider cell

diff --git a/src/hash.c b/src/hash.c
index d7625d3913ab3f175b4fc12c734b2f9a8358e4cd..e81dcf95e43848fa7086b7f781c090adc7e6ca8e 100644 (file)
--- a/src/hash.c
+++ b/src/hash.c
@@ -193,7 +193,7 @@ static void removeElementGivenHash(
   }
   sqlite3_free( elem );
   pH->count--;
-  if( pH->count<=0 ){
+  if( pH->count==0 ){
     assert( pH->first==0 );
     assert( pH->count==0 );
     sqlite3HashClear(pH);

diff --git a/src/test6.c b/src/test6.c
index 828fdc303b35e1341c983489ffc05a8781dc0bc7..f511be9def842554769f16a0abcb12e059a4ef71 100644 (file)
--- a/src/test6.c
+++ b/src/test6.c
@@ -637,7 +637,7 @@ static int cfOpen(
 
       memset(pWrapper->zData, 0, pWrapper->nData);
       for(iOff=0; iOff<pWrapper->iSize; iOff += 512){
-        int nRead = pWrapper->iSize - iOff;
+        int nRead = pWrapper->iSize - (int)iOff;
         if( nRead>512 ) nRead = 512;
         if( isDb && iOff==PENDING_BYTE ) continue;
         rc = sqlite3OsRead(pReal, &pWrapper->zData[iOff], nRead, iOff);