From 3f9bfa740f6bd337a9e1620cfadd4be99c79ede8 Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 20 Oct 2015 15:49:02 +0000 Subject: [PATCH] Initialize variables in the fts5 integrity-check code to avoid compiler warnings. FossilOrigin-Name: e979e2cccac257ad554803e6a1103558b0f159d8 --- ext/fts5/fts5_storage.c | 4 ++-- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ext/fts5/fts5_storage.c b/ext/fts5/fts5_storage.c index ce38762cad..ff4aea50e1 100644 --- a/ext/fts5/fts5_storage.c +++ b/ext/fts5/fts5_storage.c @@ -914,12 +914,12 @@ int sqlite3Fts5StorageIntegrity(Fts5Storage *p){ /* Check that the %_docsize and %_content tables contain the expected ** number of rows. */ if( rc==SQLITE_OK && pConfig->eContent==FTS5_CONTENT_NORMAL ){ - i64 nRow; + i64 nRow = 0; rc = fts5StorageCount(p, "content", &nRow); if( rc==SQLITE_OK && nRow!=p->nTotalRow ) rc = FTS5_CORRUPT; } if( rc==SQLITE_OK && pConfig->bColumnsize ){ - i64 nRow; + i64 nRow = 0; rc = fts5StorageCount(p, "docsize", &nRow); if( rc==SQLITE_OK && nRow!=p->nTotalRow ) rc = FTS5_CORRUPT; } diff --git a/manifest b/manifest index 3418ca7815..7f3a3228ee 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Another\soptimization\sfor\sfts5\sprefix\s(and\sother)\squeries. -D 2015-10-19T20:49:10.124 +C Initialize\svariables\sin\sthe\sfts5\sintegrity-check\scode\sto\savoid\scompiler\swarnings. +D 2015-10-20T15:49:02.194 F Makefile.in 2ea961bc09e441874eb3d1bf7398e04feb24f3ee F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 4eb750e0fdf52050a06d881e1b060f4bb116ed7e @@ -111,7 +111,7 @@ F ext/fts5/fts5_expr.c 28b15c9ae296204bc0a2e5cf7a667d840a9d2900 F ext/fts5/fts5_hash.c a9d4c1efebc2a91d26ad7ebdfcbf2678ceac405f F ext/fts5/fts5_index.c 38d7ddd4d5650007ee83000f0f96967ff83c710c F ext/fts5/fts5_main.c 520a29136ba07448331f73bdc36d0ffa1e9dcfef -F ext/fts5/fts5_storage.c 9b30115742b758706de70595a8d1d084e940c978 +F ext/fts5/fts5_storage.c 8038a54a88d3beb94dc7f9db6428a3bc08b718bb F ext/fts5/fts5_tcl.c 3bf445e66de32137d4693694ff7b1fd6074e32bd F ext/fts5/fts5_test_mi.c e96be827aa8f571031e65e481251dc1981d608bf F ext/fts5/fts5_tokenize.c 12c5d925286491a71bb3dad7c8924ce9cfd18320 @@ -1391,7 +1391,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 69be427c864dc3de804ca3c5f1c6addcd33cd188 -R cf51e15890c7ae1ec9dc153fd0832e0a +P 60a8bde055a960c5b8cb4e231802c75617c942d8 +R 507ca9e6ed1f2a8dcb12d2eaeb7b0450 U dan -Z 01b7158ec138174afd0e008584d0b467 +Z c40a91b7d33ce0f422b5ec994684bd4f diff --git a/manifest.uuid b/manifest.uuid index 4e22ea3ddd..74827af32d 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -60a8bde055a960c5b8cb4e231802c75617c942d8 \ No newline at end of file +e979e2cccac257ad554803e6a1103558b0f159d8 \ No newline at end of file