From: mistachkin Date: Tue, 18 Aug 2015 16:32:45 +0000 (+0000) Subject: Fix harmless compiler warning in FTS5. X-Git-Tag: version-3.9.0~220 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0cbb513a67b4d0a515ead8f925d5e0a8752dfcb8;p=thirdparty%2Fsqlite.git Fix harmless compiler warning in FTS5. FossilOrigin-Name: 02448a9fccd4532daa667e4ba6ff1dbb7f68008a --- diff --git a/ext/fts5/fts5_expr.c b/ext/fts5/fts5_expr.c index 559eead223..a713bb7c5a 100644 --- a/ext/fts5/fts5_expr.c +++ b/ext/fts5/fts5_expr.c @@ -1866,7 +1866,7 @@ static void fts5ExprFunction( int iArg = 1; if( nArg<1 ){ - char *zErr = sqlite3_mprintf("wrong number of arguments to function %s", + zErr = sqlite3_mprintf("wrong number of arguments to function %s", bTcl ? "fts5_expr_tcl" : "fts5_expr" ); sqlite3_result_error(pCtx, zErr, -1); diff --git a/manifest b/manifest index 64b99f5731..8add10892e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Minor\sfix\sto\sthe\sdisplay\sof\soversized\sKeyInfo\sstructures\sin\sthe\sP4\soperand\nof\sOpen\sopcodes\sin\sEXPLAIN\soutput. -D 2015-08-15T16:32:50.350 +C Fix\sharmless\scompiler\swarning\sin\sFTS5. +D 2015-08-18T16:32:45.211 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 2fc9ca6bf5949d415801c007ed3004a4bdb7c380 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -110,7 +110,7 @@ F ext/fts5/fts5Int.h 45f2ceb3c030f70e2cc4c199e9f700c2f2367f77 F ext/fts5/fts5_aux.c 044cb176a815f4388308738437f6e130aa384fb0 F ext/fts5/fts5_buffer.c 80f9ba4431848cb857e3d2158f5280093dcd8015 F ext/fts5/fts5_config.c fdfa63ae8e527ecfaa50f94063c610429cc887cf -F ext/fts5/fts5_expr.c 495b24f47f4d71b63339572a5beaf9f6e1b486fe +F ext/fts5/fts5_expr.c d075d36c84975a1cfcf070442d28e28027b61c25 F ext/fts5/fts5_hash.c 4bf4b99708848357b8a2b5819e509eb6d3df9246 F ext/fts5/fts5_index.c 076c4995bf06a6d1559a6e31f9a86b90f2105374 F ext/fts5/fts5_main.c fc47ad734dfb55765b7542a345cee981170e7caa @@ -1373,7 +1373,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 5e06a9c186f4b7478c73155613de219d702e0241 -R e2d0516338dae0688a20852b1e6916a7 -U drh -Z 80e45157bf277dcf2578e84040f9a7f0 +P f65a9b4ab2c6f0b7028e16e2a0f83fd6d58ae1cd +R 991670fb0c06e37ef5a984fb7f069a97 +U mistachkin +Z 6b28dc07256cbacd1d8439eff1dbe32a diff --git a/manifest.uuid b/manifest.uuid index 4f073b073f..355b99a2e1 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f65a9b4ab2c6f0b7028e16e2a0f83fd6d58ae1cd \ No newline at end of file +02448a9fccd4532daa667e4ba6ff1dbb7f68008a \ No newline at end of file