From: drh Date: Wed, 15 Jul 2015 18:04:48 +0000 (+0000) Subject: Attempt to fix harmless warnings generated by GCC and Clang runtime analyzers. X-Git-Tag: version-3.8.11~35 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=618ee61e048737307769ca61d01f4d967693c2ec;p=thirdparty%2Fsqlite.git Attempt to fix harmless warnings generated by GCC and Clang runtime analyzers. FossilOrigin-Name: b522c95ddcd7046dca756f4d1a1e90c34dbcab64 --- diff --git a/manifest b/manifest index 1cda851569..69b8bcf68e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sthe\sfuzz3.test\sscript\sso\sthat\sit\sworks\swith\sthe\snew\sbulk\spagecache\nallocation\sfeature. -D 2015-07-15T13:56:34.803 +C Attempt\sto\sfix\sharmless\swarnings\sgenerated\sby\sGCC\sand\sClang\sruntime\sanalyzers. +D 2015-07-15T18:04:48.790 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 6e8af213d49e6325bf283ebed7662254f8e15bda F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -276,7 +276,7 @@ F src/build.c b3f15255d5b16e42dafeaa638fd4f8a47c94ed70 F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0 F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b -F src/date.c e4d50b3283696836ec1036b695ead9a19e37a5ac +F src/date.c 8ec787fed4929d8ccdf6b1bc360fccc3e1d2ca58 F src/dbstat.c f402e77e25089c6003d0c60b3233b9b3947d599a F src/delete.c 8857a6f27560718f65d43bdbec86c967ae1f8dfa F src/expr.c c5c58e4d01c7ceb2266791d8d877f1b23a88e316 @@ -337,7 +337,7 @@ F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46 F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179 F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e F src/tclsqlite.c 13b9c2aa725882de807377fa889682eff2a74114 -F src/test1.c e055ab594a48d25720ed31daa5eced1163544488 +F src/test1.c 375d7bd56d9f806095deb91a3dafe61bd0e367c8 F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622 F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e @@ -1365,7 +1365,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 a73d7128fbca8dde5e90bd46ee915e39ae07dd1f -R 1575b64aa232857a5cba2b7d0fa0d544 +P 829a2dbaf17413743b58ce0533d556031a14195a +R 81af9970925c4f23f9b8c535565a4e96 U drh -Z 5196f1c48257576357ef4df004b3f923 +Z b330313b2eaf1b169130b9aad32db66a diff --git a/manifest.uuid b/manifest.uuid index db5059ad5b..e0fc25ee7e 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -829a2dbaf17413743b58ce0533d556031a14195a \ No newline at end of file +b522c95ddcd7046dca756f4d1a1e90c34dbcab64 \ No newline at end of file diff --git a/src/date.c b/src/date.c index 5f3f247ca9..6b11d9904a 100644 --- a/src/date.c +++ b/src/date.c @@ -355,7 +355,7 @@ static void computeYMD(DateTime *p){ A = Z + 1 + A - (A/4); B = A + 1524; C = (int)((B - 122.1)/365.25); - D = (36525*C)/100; + D = (36525*(C&32767))/100; E = (int)((B-D)/30.6001); X1 = (int)(30.6001*E); p->D = B - D - X1; diff --git a/src/test1.c b/src/test1.c index 3885b71ca7..15fd8c7f7d 100644 --- a/src/test1.c +++ b/src/test1.c @@ -273,6 +273,9 @@ static int clang_sanitize_address( # if __has_feature(address_sanitizer) res = 1; # endif +#endif +#ifdef __SANITIZE_ADDRESS__ + res = 1; #endif if( res==0 && getenv("OMIT_MISUSE")!=0 ) res = 1; Tcl_SetObjResult(interp, Tcl_NewIntObj(res));