From: drh <drh@noemail.net>
Date: Sat, 11 Feb 2012 19:53:24 +0000 (+0000)
Subject: Another attempt to fix warnings in the randomFunc() function.
X-Git-Tag: version-3.7.11~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af8001bfb3b38219149d1e5cecb6896fd99853bb;p=thirdparty%2Fsqlite.git

Another attempt to fix warnings in the randomFunc() function.

FossilOrigin-Name: 768df4e11670ac704d96e3b601d009aaa2fd793a
---

diff --git a/manifest b/manifest
index bf76b978d3..da4defa23a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\screating\sjournal\sfiles\s(including\s-wal\sand\s-shm\sfiles)\stry\sto\sset\sthe\nownership\sto\sbe\sthe\ssame\sas\sthe\soriginal\sdatabase.\s\sThis\swill\sprevent\sroot\nfrom\slocking\sout\sthe\soriginal\sowner\sof\sthe\sfile.
-D 2012-02-11T19:23:48.068
+C Another\sattempt\sto\sfix\swarnings\sin\sthe\srandomFunc()\sfunction.
+D 2012-02-11T19:53:24.226
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 3f79a373e57c3b92dabf76f40b065e719d31ac34
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -137,7 +137,7 @@ F src/delete.c 51d32f0a9c880663e54ce309f52e40c325d5e112
 F src/expr.c 00675123e0beec98f999aa4594d2cbe1fec33c1b
 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 F src/fkey.c 657212460bf5cfd3ae607d12ea62092844c227b5
-F src/func.c 482fb61e26d1c0f983e788276d3700eee26442df
+F src/func.c e75f41c421f00762ab9da7dc8fb90af3972cf99f
 F src/global.c 4cfdca5cb0edd33c4d021baec4ede958cb2c793b
 F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
 F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
@@ -989,7 +989,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 31142ca795005bf664f34000591e6572c72652f2
-R bf3c1343906df15f83435e1a674bd11e
+P 1254dffe4071656a783cd000b1dd40c975ac18cb
+R d9fa00aa327e93350ee48bb2f6ecc475
 U drh
-Z 10acee19c2f6805ba89a4f170956f4c5
+Z 4e53a459dae4b9322244fc7645ecba60
diff --git a/manifest.uuid b/manifest.uuid
index be561debed..fb7ca58e61 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1254dffe4071656a783cd000b1dd40c975ac18cb
\ No newline at end of file
+768df4e11670ac704d96e3b601d009aaa2fd793a
\ No newline at end of file
diff --git a/src/func.c b/src/func.c
index 385582923d..c66ad28aba 100644
--- a/src/func.c
+++ b/src/func.c
@@ -416,7 +416,7 @@ static void randomFunc(
     ** 2s complement of that positive value.  The end result can
     ** therefore be no less than -9223372036854775807.
     */
-    r = -(r ^ (((sqlite3_uint64)1)<<63));
+    r = -(r & LARGEST_INT64);
   }
   sqlite3_result_int64(context, r);
 }