From: mistachkin Date: Sun, 7 Feb 2016 20:39:27 +0000 (+0000) Subject: Fix harmless compiler warning in 'srcck1' tool and add it to the clean targets. X-Git-Tag: version-3.11.0~40 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=27b6997e9cec6ef3a27e54925db1e377a2903e75;p=thirdparty%2Fsqlite.git Fix harmless compiler warning in 'srcck1' tool and add it to the clean targets. FossilOrigin-Name: 852a529a8b112049f67a3126f677c06ae4a22d73 --- diff --git a/Makefile.in b/Makefile.in index f0c78a4ee7..54f7643327 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1225,6 +1225,7 @@ clean: rm -f sqlite-*-output.vsix rm -f mptester mptester.exe rm -f rbu rbu.exe + rm -f srcck1 srcck1.exe rm -f fuzzershell fuzzershell.exe rm -f fuzzcheck fuzzcheck.exe rm -f sqldiff sqldiff.exe diff --git a/Makefile.msc b/Makefile.msc index 0ba00d89c7..aacacbcec3 100644 --- a/Makefile.msc +++ b/Makefile.msc @@ -2016,7 +2016,7 @@ clean: del /Q testfixture.exe test.db 2>NUL del /Q LogEst.exe fts3view.exe rollback-test.exe showdb.exe 2>NUL del /Q showjournal.exe showstat4.exe showwal.exe speedtest1.exe 2>NUL - del /Q mptester.exe wordcount.exe rbu.exe 2>NUL + del /Q mptester.exe wordcount.exe rbu.exe srcck1.exe 2>NUL del /Q $(SQLITE3EXE) $(SQLITE3DLL) sqlite3.def 2>NUL del /Q sqlite3.c sqlite3-*.c 2>NUL del /Q sqlite3rc.h 2>NUL diff --git a/main.mk b/main.mk index f4cbbdbb95..149f94e209 100644 --- a/main.mk +++ b/main.mk @@ -899,6 +899,7 @@ clean: rm -f speedtest1 speedtest1.exe rm -f wordcount wordcount.exe rm -f rbu rbu.exe + rm -f srcck1 srcck1.exe rm -f sqlite3.c sqlite3-*.c fts?amal.c tclsqlite3.c rm -f sqlite3rc.h rm -f shell.c sqlite3ext.h diff --git a/manifest b/manifest index 3a81b43628..dbd577f123 100644 --- a/manifest +++ b/manifest @@ -1,8 +1,8 @@ -C Add\sthe\ssourcetest\starget\sto\sMakefile.msc. -D 2016-02-07T00:08:08.480 -F Makefile.in 0a957a57243a3d55e96b1514e22ffae5db9ea116 +C Fix\sharmless\scompiler\swarning\sin\s'srcck1'\stool\sand\sadd\sit\sto\sthe\sclean\stargets. +D 2016-02-07T20:39:27.144 +F Makefile.in dac2776c84e0d533b158a9af6e57e05c4a6b19f3 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 -F Makefile.msc a3f8092763bb5d0057f0f4feb6b7fcc19713e107 +F Makefile.msc fcf377286d910b47e072da1ac7945976337c0925 F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7 F VERSION 866588d1edf0ccb5b0d33896974338f97564f719 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50 @@ -272,7 +272,7 @@ F ext/userauth/userauth.c 5fa3bdb492f481bbc1709fc83c91ebd13460c69e F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60 -F main.mk f51c0652d2a623160e90a758e01312a6a00f3454 +F main.mk 37497b06d3e3acb2c71675d76627a3b2639c6db0 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504 @@ -1416,7 +1416,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 7ce07da76b5e745783e703a834417d725b7d45fd F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c F tool/sqldiff.c 5a26205111e6fa856d9b1535b1637744dcdb930b -F tool/srcck1.c 0522865656ed7f89a8acdcfa6ba2d4f898f4e55c +F tool/srcck1.c 4c39bdfa9a92edd20233ee720df84dbeb2417602 F tool/stack_usage.tcl f8e71b92cdb099a147dad572375595eae55eca43 F tool/symbols-mingw.sh 4dbcea7e74768305384c9fd2ed2b41bbf9f0414d F tool/symbols.sh fec58532668296d7c7dc48be9c87f75ccdb5814f @@ -1427,7 +1427,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P b0b4624fc5d53bb0cc9fae7dad51984837d946ac -R 08c9d9815def36a9ada11c24d7dc13cb -U drh -Z 21cfff4994071e02bdb1eef8143a0ef4 +P ab269e720552483c5617906837e294c1be3e0a57 +R b0244c1b9f3d2cf89729e9f132d42a5e +U mistachkin +Z 9a8eb772a0a9cfffcb8487b60e9945a2 diff --git a/manifest.uuid b/manifest.uuid index 16127e2758..3f741fdf8b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ab269e720552483c5617906837e294c1be3e0a57 \ No newline at end of file +852a529a8b112049f67a3126f677c06ae4a22d73 \ No newline at end of file diff --git a/tool/srcck1.c b/tool/srcck1.c index ae19fbebaa..e95765185f 100644 --- a/tool/srcck1.c +++ b/tool/srcck1.c @@ -124,7 +124,7 @@ static unsigned int findAllSideEffects(const char *z){ || strncmp(&z[i],"NEVER(",6)==0 || strncmp(&z[i],"testcase(",9)==0 ){ - unsigned int j, n; + unsigned int n; const char *z2 = &z[i+5]; while( z2[0]!='(' ){ z2++; } z2++;