From: drh <drh@noemail.net>
Date: Fri, 25 Jul 2014 21:35:39 +0000 (+0000)
Subject: Try to fix harmless compiler warnings reported by Fortify.
X-Git-Tag: version-3.8.6~58
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eac5bd78704006937a9bb5bee2dd724c7682b5e9;p=thirdparty%2Fsqlite.git

Try to fix harmless compiler warnings reported by Fortify.

FossilOrigin-Name: e0fa6fdc14ac5458f9200cbae124f8025ea534ea
---

diff --git a/manifest b/manifest
index 34fbf9cae2..1097f4e5de 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\scomments\son\sVDBE\sopcodes,\sfor\sbetter\sdocumentation.\s\sNo\scode\nor\slogic\schanges.
-D 2014-07-25T18:37:42.754
+C Try\sto\sfix\sharmless\scompiler\swarnings\sreported\sby\sFortify.
+D 2014-07-25T21:35:39.767
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -167,7 +167,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c a729e63cf5cd1829507cb7b8e89f99b95141bb53
 F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
-F src/btree.c 70c60a3807b2072982f184d9614e020d2953f89c
+F src/btree.c b5531339cd826af46b9621e4a9323971a9380e12
 F src/btree.h 4245a349bfe09611d7ff887dbc3a80cee8b7955a
 F src/btreeInt.h cf180d86b2e9e418f638d65baa425c4c69c0e0e3
 F src/build.c 48f400fa14fd6add244b954ce7e223ce7ccacf0b
@@ -216,7 +216,7 @@ F src/parse.y 22d6a074e5f5a7258947a1dc55a9bf946b765dd0
 F src/pcache.c d8eafac28290d4bb80332005435db44991d07fc2
 F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222
 F src/pcache1.c 102e6f5a2fbc646154463eb856d1fd716867b64c
-F src/pragma.c e17c5ea1cb9eb9d93c41bbb7c3a17e747d5e0335
+F src/pragma.c 30f3b2ac09fef58320375d78e0e18b976198fc69
 F src/prepare.c 677521ab7132615a8a26107a1d1c3132f44ae337
 F src/printf.c af06f66927919730f03479fed6ae9854f73419f4
 F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
@@ -227,7 +227,7 @@ F src/shell.c 191129c3f7a9cf241aea90ff6a6be3e74d3767f0
 F src/sqlite.h.in ac4451c9da2771d2f4d702ef89722407242906d9
 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
 F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
-F src/sqliteInt.h 152134c6223369e2e1acb7b9cc2c0db052dae28a
+F src/sqliteInt.h 068e42f41a09ce6b9edbe194ac8a470ab53145df
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@ -287,7 +287,7 @@ F src/vdbe.c b7af861342a215c7f27d3f20d92fe0b70f54fb3e
 F src/vdbe.h c63fad052c9e7388d551e556e119c0bcf6bebdf8
 F src/vdbeInt.h f5513f2b5ac1e2c5128996c7ea23add256a301df
 F src/vdbeapi.c 24e40422382beb774daab11fe9fe9d37e8a04949
-F src/vdbeaux.c 1ffe0bbc3a2c8aedd95622de9be6b6d07b3d3c6b
+F src/vdbeaux.c ac063f36c929f88bf6cecdbcc413000e272265bb
 F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
 F src/vdbemem.c d90a1e8acf8b63dc9d14cbbea12bfec6cec31394
 F src/vdbesort.c 44441d73b08b3a638dcdb725afffb87c6574ad27
@@ -1184,7 +1184,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 2230c74f1efa591770176c9b40e920724a3c39e1
-R 29600123a95daa5177cd67bf8abb597c
+P 2d32e4876e0b162730f81e5c2658be12d64a9a99
+R 863e6abd5a7272b515477418397f96e6
 U drh
-Z 36e2e79e107a063c258f47507608b039
+Z f462357bfa110cd51b2e07287181f811
diff --git a/manifest.uuid b/manifest.uuid
index a16837f979..908cd7712f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2d32e4876e0b162730f81e5c2658be12d64a9a99
\ No newline at end of file
+e0fa6fdc14ac5458f9200cbae124f8025ea534ea
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index 9032a9304c..b72a2ab01d 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -1632,7 +1632,7 @@ static Pgno btreePagecount(BtShared *pBt){
 u32 sqlite3BtreeLastPage(Btree *p){
   assert( sqlite3BtreeHoldsMutex(p) );
   assert( ((p->pBt->nPage)&0x8000000)==0 );
-  return (int)btreePagecount(p->pBt);
+  return btreePagecount(p->pBt);
 }
 
 /*
diff --git a/src/pragma.c b/src/pragma.c
index 709662c989..c4374cc71c 100644
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -480,7 +480,7 @@ static const struct sPragmaNames {
 ** to support legacy SQL code.  The safety level used to be boolean
 ** and older scripts may have used numbers 0 for OFF and 1 for ON.
 */
-static u8 getSafetyLevel(const char *z, int omitFull, int dflt){
+static u8 getSafetyLevel(const char *z, int omitFull, u8 dflt){
                              /* 123456789 123456789 */
   static const char zText[] = "onoffalseyestruefull";
   static const u8 iOffset[] = {0, 1, 2, 4, 9, 12, 16};
@@ -502,7 +502,7 @@ static u8 getSafetyLevel(const char *z, int omitFull, int dflt){
 /*
 ** Interpret the given string as a boolean value.
 */
-u8 sqlite3GetBoolean(const char *z, int dflt){
+u8 sqlite3GetBoolean(const char *z, u8 dflt){
   return getSafetyLevel(z,1,dflt)!=0;
 }
 
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 7a5d225b84..5d72295d66 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -3364,7 +3364,7 @@ void sqlite3FileSuffix3(const char*, char*);
 #else
 # define sqlite3FileSuffix3(X,Y)
 #endif
-u8 sqlite3GetBoolean(const char *z,int);
+u8 sqlite3GetBoolean(const char *z,u8);
 
 const void *sqlite3ValueText(sqlite3_value*, u8);
 int sqlite3ValueBytes(sqlite3_value*, u8);
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index ac945df59e..240085bfbf 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -2786,7 +2786,7 @@ int sqlite3VdbeCursorMoveto(VdbeCursor *p){
 */
 u32 sqlite3VdbeSerialType(Mem *pMem, int file_format){
   int flags = pMem->flags;
-  int n;
+  u32 n;
 
   if( flags&MEM_Null ){
     return 0;
@@ -2816,11 +2816,11 @@ u32 sqlite3VdbeSerialType(Mem *pMem, int file_format){
     return 7;
   }
   assert( pMem->db->mallocFailed || flags&(MEM_Str|MEM_Blob) );
-  n = pMem->n;
+  assert( pMem->n>=0 );
+  n = (u32)pMem->n;
   if( flags & MEM_Zero ){
     n += pMem->u.nZero;
   }
-  assert( n>=0 );
   return ((n*2) + 12 + ((flags&MEM_Str)!=0));
 }