Fix two compiler warnings. No functional code changes.

FossilOrigin-Name: c829868aa2254c5e2268cdb803462cc6ec5cb71e

diff --git a/manifest b/manifest
index 61ec936a4388b3ac042cc8411c5eaf7f1f454fe3..2f857e15dbd9551beb39aff454bbad3f4ce4845d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Fix\sadditional\scases\sof\spossible\ssigned\sinteger\soverflow,\sespecially\swith\nregard\sto\snegation.
-D 2011-03-08T02:38:28.410
+C Fix\stwo\scompiler\swarnings.\s\sNo\sfunctional\scode\schanges.
+D 2011-03-08T13:06:41.560
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 27701a1653595a1f2187dc61c8117e00a6c1d50f
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -165,7 +165,7 @@ F src/os.c 22ac61d06e72a0dac900400147333b07b13d8e1d
 F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
 F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
 F src/os_os2.c 2e452c9f2ca507623ad351c33a8a8b27849b1863
-F src/os_unix.c 54cd8b64e342984cb9a565d8bbd3d4ed4f6679ad
+F src/os_unix.c 67f9a304641f126f5f7326cd452c2df3d9a4d512
 F src/os_win.c 9abdcdd925416d854eabb0996c96debd92abfef5
 F src/pager.c 6aa906b60a59664ba58d3f746164bb010d407ce1
 F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1
@@ -231,7 +231,7 @@ F src/tokenize.c 604607d6813e9551cf5189d899e0a25c12681080
 F src/trigger.c 95d2ff4b2996fabe886c9764b5978980e29f4afa
 F src/update.c 81911be16ece3c3e7716aa18565b4814ec41f8b9
 F src/utf.c 1baeeac91707a4df97ccc6141ec0f808278af685
-F src/util.c f6c87805d36799a0d90ea6f0c8c961bee84a6950
+F src/util.c cd997077bad039efc0597eb027c929658f93c018
 F src/vacuum.c 924bd1bcee2dfb05376f79845bd3b4cec7b54b2f
 F src/vdbe.c ac6e8b8264dcc0e4beea44307ff63b1275a9ca3e
 F src/vdbe.h 4de0efb4b0fdaaa900cf419b35c458933ef1c6d2
@@ -914,14 +914,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 3bfbf026dd6a0eeef07f8f5f1ebf74c9cfebcd61
-R 14384a8f4890b1a5943c537e15c8a789
+P 2d5800bd8cfc7d7f5578a71b1aeaa74b2ec4b372
+R 041c7b161bddb56919915095c6eecb0a
 U drh
-Z f625fb04060bd1f53406bce59c01aeac
+Z 4d3f158d515c892cb9d8cf0046e71654
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFNdZanoxKgR168RlERAuRYAJ9wNMACH3kVtSPlH9ioTxMSTFcVAwCdEtGo
-QSf9S56IOhmO4JkP2her+Ik=
-=G+By
+iD8DBQFNdinkoxKgR168RlERAjW4AJ0VMtFmIHefKTsESvaC3Qf84rP9gwCdHHsc
+QH4FUHE8AWOo5yx+Cxq1TMw=
+=jciZ
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 5beb948d1c45a9ed3d6e4607bd13f3d96ee567c6..f483a27486b716d1b422ba6162cb08cd49831aa7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2d5800bd8cfc7d7f5578a71b1aeaa74b2ec4b372
\ No newline at end of file
+c829868aa2254c5e2268cdb803462cc6ec5cb71e
\ No newline at end of file

diff --git a/src/os_unix.c b/src/os_unix.c
index 40e4b89cd6756ab1f723957f5323eba12b51422b..b2374beec320abcc33245d74967449357a770c0e 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -1357,6 +1357,7 @@ static int _posixUnlock(sqlite3_file *id, int eFileLock, int handleNFSUnlock){
     if( eFileLock==SHARED_LOCK ){
 
 #if !defined(__APPLE__) || !SQLITE_ENABLE_LOCKING_STYLE
+      (void)handleNFSUnlock;
       assert( handleNFSUnlock==0 );
 #endif
 #if defined(__APPLE__) && SQLITE_ENABLE_LOCKING_STYLE

diff --git a/src/util.c b/src/util.c
index 05934c4602ebccedbdea8fb72fe27ca10049fac6..5cc2b613088f97bde277d5107ce6d9116ecf9a49 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -1145,6 +1145,6 @@ int sqlite3MulInt64(i64 *pA, i64 iB){
 */
 int sqlite3AbsInt32(int x){
   if( x>=0 ) return x;
-  if( x==0x80000000 ) return 0x7fffffff;
+  if( x==(int)0x80000000 ) return 0x7fffffff;
   return -x;
 }