From: mistachkin Date: Tue, 14 Jul 2015 17:18:05 +0000 (+0000) Subject: Fix some harmless compiler warnings. X-Git-Tag: version-3.8.11~40 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=532f179cabf9af8facf244648776f8b17f98f846;p=thirdparty%2Fsqlite.git Fix some harmless compiler warnings. FossilOrigin-Name: 3de030c904d125ccf41fa1929646b8a002b5341b --- diff --git a/ext/fts5/fts5_aux.c b/ext/fts5/fts5_aux.c index 3f9c227e6a..818dfcf297 100644 --- a/ext/fts5/fts5_aux.c +++ b/ext/fts5/fts5_aux.c @@ -255,7 +255,7 @@ static void fts5SnippetFunction( int iCol; /* 1st argument to snippet() */ const char *zEllips; /* 4th argument to snippet() */ int nToken; /* 5th argument to snippet() */ - int nInst; /* Number of instance matches this row */ + int nInst = 0; /* Number of instance matches this row */ int i; /* Used to iterate through instances */ int nPhrase; /* Number of phrases in query */ unsigned char *aSeen; /* Array of "seen instance" flags */ @@ -263,7 +263,7 @@ static void fts5SnippetFunction( int iBestStart = 0; /* First token of best snippet */ int iBestLast; /* Last token of best snippet */ int nBestScore = 0; /* Score of best snippet */ - int nColSize; /* Total size of iBestCol in tokens */ + int nColSize = 0; /* Total size of iBestCol in tokens */ if( nVal!=5 ){ const char *zErr = "wrong number of arguments to function snippet()"; @@ -407,8 +407,8 @@ static int fts5Bm25GetData( p = pApi->xGetAuxdata(pFts, 0); if( p==0 ){ int nPhrase; /* Number of phrases in query */ - sqlite3_int64 nRow; /* Number of rows in table */ - sqlite3_int64 nToken; /* Number of tokens in table */ + sqlite3_int64 nRow = 0; /* Number of rows in table */ + sqlite3_int64 nToken = 0; /* Number of tokens in table */ int nByte; /* Bytes of space to allocate */ int i; @@ -481,9 +481,9 @@ static void fts5Bm25Function( double score = 0.0; /* SQL function return value */ Fts5Bm25Data *pData; /* Values allocated/calculated once only */ int i; /* Iterator variable */ - int nInst; /* Value returned by xInstCount() */ - double D; /* Total number of tokens in row */ - double *aFreq; /* Array of phrase freq. for current row */ + int nInst = 0; /* Value returned by xInstCount() */ + double D = 0.0; /* Total number of tokens in row */ + double *aFreq = 0; /* Array of phrase freq. for current row */ /* Calculate the phrase frequency (symbol "f(qi,D)" in the documentation) ** for each phrase in the query for the current row. */ diff --git a/ext/fts5/fts5_index.c b/ext/fts5/fts5_index.c index 0b8f137ebf..dc664aab71 100644 --- a/ext/fts5/fts5_index.c +++ b/ext/fts5/fts5_index.c @@ -738,7 +738,7 @@ static Fts5Data *fts5DataReadOrBuffer( if( rc==SQLITE_ERROR ) rc = FTS5_CORRUPT; if( rc==SQLITE_OK ){ - u8 *aOut; /* Read blob data into this buffer */ + u8 *aOut = 0; /* Read blob data into this buffer */ int nByte = sqlite3_blob_bytes(p->pReader); if( pBuf ){ fts5BufferSize(pBuf, MAX(nByte, p->pConfig->pgsz) + 20); @@ -1198,7 +1198,7 @@ static void fts5StructurePromote( if( p->rc==SQLITE_OK ){ int iTst; int iPromote = -1; - int szPromote; /* Promote anything this size or smaller */ + int szPromote = 0; /* Promote anything this size or smaller */ Fts5StructureSegment *pSeg; /* Segment just written */ int szSeg; /* Size of segment just written */ @@ -1863,8 +1863,8 @@ static void fts5SegIterNext( } }else if( pIter->pSeg==0 ){ const u8 *pList = 0; - const char *zTerm; - int nList; + const char *zTerm = 0; + int nList = 0; if( 0==(pIter->flags & FTS5_SEGITER_ONETERM) ){ sqlite3Fts5HashScanNext(p->pHash); sqlite3Fts5HashScanEntry(p->pHash, &zTerm, &pList, &nList); @@ -2215,7 +2215,6 @@ static void fts5LeafSeek( while( 1 ){ int i; int nCmp; - i64 rowid; /* Figure out how many new bytes are in this term */ fts5IndexGetVarint32(a, iOff, nNew); @@ -2324,7 +2323,6 @@ static void fts5SegIterSeekInit( int h; int bGe = (flags & FTS5INDEX_QUERY_SCAN); int bDlidx = 0; /* True if there is a doclist-index */ - Fts5Data *pLeaf; static int nCall = 0; nCall++; diff --git a/ext/fts5/fts5_main.c b/ext/fts5/fts5_main.c index ccb94bd8d6..87902935b4 100644 --- a/ext/fts5/fts5_main.c +++ b/ext/fts5/fts5_main.c @@ -361,7 +361,7 @@ static int fts5InitVtab( Fts5Global *pGlobal = (Fts5Global*)pAux; const char **azConfig = (const char**)argv; int rc = SQLITE_OK; /* Return code */ - Fts5Config *pConfig; /* Results of parsing argc/argv */ + Fts5Config *pConfig = 0; /* Results of parsing argc/argv */ Fts5Table *pTab = 0; /* New virtual table object */ /* Allocate the new vtab object and parse the configuration */ @@ -756,7 +756,7 @@ static int fts5CursorReseek(Fts5Cursor *pCsr, int *pbSkip){ */ static int fts5NextMethod(sqlite3_vtab_cursor *pCursor){ Fts5Cursor *pCsr = (Fts5Cursor*)pCursor; - int rc; + int rc = SQLITE_OK; assert( (pCsr->ePlan<2)== (pCsr->ePlan==FTS5_PLAN_MATCH || pCsr->ePlan==FTS5_PLAN_SOURCE) diff --git a/ext/fts5/fts5_storage.c b/ext/fts5/fts5_storage.c index 601f85713e..da822ffad2 100644 --- a/ext/fts5/fts5_storage.c +++ b/ext/fts5/fts5_storage.c @@ -501,7 +501,7 @@ static int fts5StorageSaveTotals(Fts5Storage *p){ int sqlite3Fts5StorageDelete(Fts5Storage *p, i64 iDel){ Fts5Config *pConfig = p->pConfig; int rc; - sqlite3_stmt *pDel; + sqlite3_stmt *pDel = 0; rc = fts5StorageLoadTotals(p, 1); @@ -545,7 +545,7 @@ int sqlite3Fts5StorageSpecialDelete( ){ Fts5Config *pConfig = p->pConfig; int rc; - sqlite3_stmt *pDel; + sqlite3_stmt *pDel = 0; assert( pConfig->eContent!=FTS5_CONTENT_NORMAL ); rc = fts5StorageLoadTotals(p, 1); @@ -719,7 +719,7 @@ int sqlite3Fts5StorageInsert( ){ Fts5Config *pConfig = p->pConfig; int rc = SQLITE_OK; /* Return code */ - sqlite3_stmt *pInsert; /* Statement used to write %_content table */ + sqlite3_stmt *pInsert = 0; /* Statement used to write %_content table */ int eStmt = 0; /* Type of statement used on %_content */ int i; /* Counter variable */ Fts5InsertCtx ctx; /* Tokenization callback context object */ diff --git a/manifest b/manifest index a07ab9a0dd..9780c6d113 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Always\sinvoke\sthe\sprofile\scallback\seven\sif\sthe\sstatement\sdoes\snot\srun\sto\ncompletion. -D 2015-07-14T14:48:50.217 +C Fix\ssome\sharmless\scompiler\swarnings. +D 2015-07-14T17:18:05.834 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 2a4a94d9c6ad8cde388b672d89d1463e6f38a6da F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -107,14 +107,14 @@ F ext/fts3/unicode/parseunicode.tcl da577d1384810fb4e2b209bf3313074353193e95 F ext/fts5/extract_api_docs.tcl 06583c935f89075ea0b32f85efa5dd7619fcbd03 F ext/fts5/fts5.h 81d1a92fc2b4bd477af7e4e0b38b456f3e199fba F ext/fts5/fts5Int.h 8d9bce1847a10df2e4ed9492ea4f3868276748fb -F ext/fts5/fts5_aux.c 7cd0e2858171dacf505fea4e2e84ee6126854c3d +F ext/fts5/fts5_aux.c 044cb176a815f4388308738437f6e130aa384fb0 F ext/fts5/fts5_buffer.c 80f9ba4431848cb857e3d2158f5280093dcd8015 F ext/fts5/fts5_config.c b2456e9625bca41c51d54c363e369c6356895c90 F ext/fts5/fts5_expr.c d2e148345639c5a5583e0daa39a639bf298ae6a7 F ext/fts5/fts5_hash.c 219f4edd72e5cf95b19c33f1058809a18fad5229 -F ext/fts5/fts5_index.c 1a1fd996dfe2d632df1dd00689553bc0d205497d -F ext/fts5/fts5_main.c 2e43726b3ef40b3d5efc0adc7c279d857b1c74fe -F ext/fts5/fts5_storage.c 4cae85b5287b159d9d98174a4e70adf872b0930a +F ext/fts5/fts5_index.c cfd41d49591e4e4ce2a5f84de35512f59fbb360d +F ext/fts5/fts5_main.c 8f279999deb204b0c7760464f60f88666046398b +F ext/fts5/fts5_storage.c 1c35a38a564ee9cadcbd7ae0b13a806bdda722bd F ext/fts5/fts5_tcl.c 85eb4e0d0fefa9420b78151496ad4599a1783e20 F ext/fts5/fts5_tokenize.c 30f97a8c74683797b4cd233790444fbefb3b0708 F ext/fts5/fts5_unicode2.c 78273fbd588d1d9bd0a7e4e0ccc9207348bae33c @@ -269,7 +269,7 @@ F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240 F src/backup.c 4d9134dc988a87838c06056c89c0e8c4700a0452 F src/bitvec.c d1f21d7d91690747881f03940584f4cc548c9d3d F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79 -F src/btree.c 781deff0d5af639e8dd4f83ec963cc3bbf8cffc2 +F src/btree.c f48b3ef91676c06a90a8832987ecef6b94c931ee F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1 F src/btreeInt.h 2ad754dd4528baa8d0946a593cc373b890bf859e F src/build.c b3f15255d5b16e42dafeaa638fd4f8a47c94ed70 @@ -1365,7 +1365,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 e548d77b3c91cdf11c78d1a688fd768e209bdbf5 -R f434f0b9092147e4e9389e2958ccbd33 -U drh -Z 3bea78814fd8f9c4678ec13302736bdc +P 202479aa0a62067343e724487960b8a039e2e978 +R 2160d68c9d0127f66e3d6f1278c01344 +U mistachkin +Z a4e5a6ada18fe91bfc53e29cc79ebc33 diff --git a/manifest.uuid b/manifest.uuid index e4e6a3512a..a29e2790a6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -202479aa0a62067343e724487960b8a039e2e978 \ No newline at end of file +3de030c904d125ccf41fa1929646b8a002b5341b \ No newline at end of file diff --git a/src/btree.c b/src/btree.c index 17c7bb67c3..2692ade8e4 100644 --- a/src/btree.c +++ b/src/btree.c @@ -8959,7 +8959,7 @@ static int checkTreePage( const char *saved_zPfx = pCheck->zPfx; int saved_v1 = pCheck->v1; int saved_v2 = pCheck->v2; - u8 savedIsInit; + u8 savedIsInit = 0; /* Check that the page exists */