From: drh Date: Tue, 2 Aug 2016 08:45:26 +0000 (+0000) Subject: Fix harmless compiler warnings in sqlite3_status(). X-Git-Tag: version-3.14.0~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=38b802dfd7292b0b8ac228aa3812be6b2c6a076d;p=thirdparty%2Fsqlite.git Fix harmless compiler warnings in sqlite3_status(). FossilOrigin-Name: 7c38a79cdd42aaa45715aea330d10ca859098837 --- diff --git a/manifest b/manifest index 15cc8e1381..02f0e10029 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Update\sthe\swordcount.c\stest\sprogram\sand\sadd\sa\snew\sscript\s"time-wordcount.sh"\nfor\sadditional\sperformance\stesting. -D 2016-08-01T21:17:53.023 +C Fix\sharmless\scompiler\swarnings\sin\ssqlite3_status(). +D 2016-08-02T08:45:26.626 F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 3340e479e5221f06c3d61726f8f7efff885e4233 @@ -390,7 +390,7 @@ F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae F src/sqliteInt.h d6f221a5bd572df935140beda82f357c2185a77c F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247 -F src/status.c 5b18f9526900f61189ab0b83f1ef41d9f871a2ab +F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1 F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9 F src/tclsqlite.c bdae822f21e229b6daced15938b6343ce44ef454 F src/test1.c 0a0909cf7962d2359db329c08d15b90b4b6e724f @@ -1509,7 +1509,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 90d2c490fc2ed4e073711b84f989ca4d496dcfb5 -R 785c152fa91bad6599d646e4e2f00927 +P d8ef9f58643f13dd3d16dcde0d829ae08324f04b +R 043c924e3262ae632c6a04160549d94d U drh -Z e82d6de7fe92cf55ce862dce0d383efb +Z c53a56bb9efce70acc3af43de2ff893c diff --git a/manifest.uuid b/manifest.uuid index a4b3d0224f..a43f3794d8 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d8ef9f58643f13dd3d16dcde0d829ae08324f04b \ No newline at end of file +7c38a79cdd42aaa45715aea330d10ca859098837 \ No newline at end of file diff --git a/src/status.c b/src/status.c index 949908ed23..24dcad4572 100644 --- a/src/status.c +++ b/src/status.c @@ -158,7 +158,7 @@ int sqlite3_status64( return SQLITE_OK; } int sqlite3_status(int op, int *pCurrent, int *pHighwater, int resetFlag){ - sqlite3_int64 iCur, iHwtr; + sqlite3_int64 iCur = 0, iHwtr = 0; int rc; #ifdef SQLITE_ENABLE_API_ARMOR if( pCurrent==0 || pHighwater==0 ) return SQLITE_MISUSE_BKPT;