From: drh Date: Thu, 11 Oct 2018 16:53:37 +0000 (+0000) Subject: Fix harmless compiler warnings in the CLI. X-Git-Tag: version-3.26.0~89 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e93f82658a900b157eedf683bb0281f62923825f;p=thirdparty%2Fsqlite.git Fix harmless compiler warnings in the CLI. FossilOrigin-Name: 1916d2912a4ef5c251853de3c9d66417e20f0c0fc8ddfbc84c131dfd798439f6 --- diff --git a/manifest b/manifest index 5fdba93072..fadcf41d71 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Always\sreset\sthe\spager\sbefore\schanging\sthe\scodec. -D 2018-10-11T16:38:56.549 +C Fix\sharmless\scompiler\swarnings\sin\sthe\sCLI. +D 2018-10-11T16:53:37.019 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F Makefile.in 01e95208a78b57d056131382c493c963518f36da4c42b12a97eb324401b3a334 @@ -504,7 +504,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384 F src/resolve.c bc8c79e56439b111e7d9415e44940951f7087e9466c3a9d664558ef0faf31073 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93 F src/select.c 33aacf1c17c64a00788c779b23d0875dd0d90eb4c08f867ebc31139ef3a67c95 -F src/shell.c.in fa815984cdb07aad83fa0231ce3de32e7a4d022ab4cbc40f851b1881839b8fed +F src/shell.c.in 248af8c0d785c98268353e58c96715313f3b091bf220d35366affc9a9c0d4e1d F src/sqlite.h.in 4b4c2f2daeeed4412ba9d81bc78092c69831fe6eda4f0ae5bf951da51a8dccec F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 305adca1b5da4a33ce2db5bd236935768e951d5651bfe5560ed55cfcdbce6a63 @@ -1771,7 +1771,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 90cf32cde072a305f30c75a71665d1f9e23e805c0a49f5306f015c056dd70f0c -R a9a8bd986a1a8ae15295689f4551498f +P 0bf0fd242b93c3bd308ab46db1be9edef141b89db07a0f5a4ed8b23c963da0d5 +R 39f23ee94b2c360e452a32e265e4dde1 U drh -Z 153df3ec174a478a1e4c4ee9d2527b35 +Z 4b0c86ae06c4aa2155872fd34a461306 diff --git a/manifest.uuid b/manifest.uuid index 6e031d644c..0f1c49939f 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -0bf0fd242b93c3bd308ab46db1be9edef141b89db07a0f5a4ed8b23c963da0d5 \ No newline at end of file +1916d2912a4ef5c251853de3c9d66417e20f0c0fc8ddfbc84c131dfd798439f6 \ No newline at end of file diff --git a/src/shell.c.in b/src/shell.c.in index c1db72ce59..e70e2939bd 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -3506,7 +3506,8 @@ static const char *(azHelp[]) = { ** Return the number of matches. */ static int showHelp(FILE *out, const char *zPattern){ - int i, j; + int i = 0; + int j = 0; int n = 0; char *zPat; if( zPattern==0 @@ -6169,7 +6170,7 @@ static int do_meta_command(char *zLine, ShellState *p){ if( c=='h' && strncmp(azArg[0], "help", n)==0 ){ if( nArg>=2 ){ - int n = showHelp(p->out, azArg[1]); + n = showHelp(p->out, azArg[1]); if( n==0 ){ utf8_printf(p->out, "Nothing matches '%s'\n", azArg[1]); }