Fix harmless compiler warnings in the core.

FossilOrigin-Name: 55e93f256018757e5e1cb3b10ef48abf5914e7687419eae58b00998a37061261

diff --git a/ext/misc/completion.c b/ext/misc/completion.c
index 8dc5d7dbafd514e63d7c3def2e10deb9f386d550..79f889abf19be427b658b478600831ede637d90d 100644 (file)
--- a/ext/misc/completion.c
+++ b/ext/misc/completion.c
@@ -106,6 +106,11 @@ static int completionConnect(
   completion_vtab *pNew;
   int rc;
 
+  (void)(pAux);    /* Unused parameter */
+  (void)(argc);    /* Unused parameter */
+  (void)(argv);    /* Unused parameter */
+  (void)(pzErr);   /* Unused parameter */
+
 /* Column numbers */
 #define COMPLETION_COLUMN_CANDIDATE 0  /* Suggested completion of the input */
 #define COMPLETION_COLUMN_PREFIX    1  /* Prefix of the word to be completed */
@@ -192,6 +197,8 @@ static const char *completionKwrds[] = {
   "UPDATE", "USING", "VACUUM", "VALUES", "VIEW", "VIRTUAL", "WHEN", "WHERE",
   "WITH", "WITHOUT",
 };
+#define completionKwCount \
+   (int)(sizeof(completionKwrds)/sizeof(completionKwrds[0]))
 
 /*
 ** Advance a completion_cursor to its next row of output.
@@ -215,7 +222,7 @@ static int completionNext(sqlite3_vtab_cursor *cur){
   while( pCur->ePhase!=COMPLETION_EOF ){
     switch( pCur->ePhase ){
       case COMPLETION_KEYWORDS: {
-        if( pCur->j >=  sizeof(completionKwrds)/sizeof(completionKwrds[0]) ){
+        if( pCur->j >= completionKwCount ){
           pCur->zCurrentRow = 0;
           pCur->ePhase = COMPLETION_DATABASES;
         }else{
@@ -372,6 +379,8 @@ static int completionFilter(
 ){
   completion_cursor *pCur = (completion_cursor *)pVtabCursor;
   int iArg = 0;
+  (void)(idxStr);   /* Unused parameter */
+  (void)(argc);     /* Unused parameter */
   completionCursorReset(pCur);
   if( idxNum & 1 ){
     pCur->nPrefix = sqlite3_value_bytes(argv[iArg]);
@@ -426,6 +435,7 @@ static int completionBestIndex(
   int nArg = 0;          /* Number of arguments that completeFilter() expects */
   const struct sqlite3_index_constraint *pConstraint;
 
+  (void)(tab);    /* Unused parameter */
   pConstraint = pIdxInfo->aConstraint;
   for(i=0; i<pIdxInfo->nConstraint; i++, pConstraint++){
     if( pConstraint->usable==0 ) continue;
@@ -480,6 +490,9 @@ static sqlite3_module completionModule = {
   0,                         /* xRollback */
   0,                         /* xFindMethod */
   0,                         /* xRename */
+  0,                         /* xSavepoint */
+  0,                         /* xRelease */
+  0                          /* xRollbackTo */
 };
 
 #endif /* SQLITE_OMIT_VIRTUALTABLE */
@@ -502,6 +515,7 @@ int sqlite3_completion_init(
 ){
   int rc = SQLITE_OK;
   SQLITE_EXTENSION_INIT2(pApi);
+  (void)(pzErrMsg);  /* Unused parameter */
 #ifndef SQLITE_OMIT_VIRTUALTABLE
   rc = sqlite3CompletionVtabInit(db);
 #endif

diff --git a/ext/misc/fileio.c b/ext/misc/fileio.c
index fbe2d030c008ef6daf34e34b606906219472a0e0..2c00ad971da9fcf519f4347c44a2ccdc0f8bfa56 100644 (file)
--- a/ext/misc/fileio.c
+++ b/ext/misc/fileio.c
@@ -32,6 +32,7 @@ static void readfileFunc(
   long nIn;
   void *pBuf;
 
+  (void)(argc);  /* Unused parameter */
   zName = (const char*)sqlite3_value_text(argv[0]);
   if( zName==0 ) return;
   in = fopen(zName, "rb");
@@ -64,6 +65,7 @@ static void writefileFunc(
   sqlite3_int64 rc;
   const char *zFile;
 
+  (void)(argc);  /* Unused parameter */
   zFile = (const char*)sqlite3_value_text(argv[0]);
   if( zFile==0 ) return;
   out = fopen(zFile, "wb");

diff --git a/manifest b/manifest
index 162add8085b7a3e04ae0b51257a6d83ca561feb9..270e42e442f1e0ddceaac35455a53c5f318ebe0c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\swin32GetTimeOfDay()\sin\sthe\slsm1\stest\scode\smore\sportable.
-D 2017-07-11T17:54:27.449
+C Fix\sharmless\scompiler\swarnings\sin\sthe\score.
+D 2017-07-11T18:11:33.473
 F Makefile.in 081e48dfe7f995d57ce1a88ddf4d2917b4349158648a6cd45b42beae30de3a12
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 20850e3e8d4d4791e0531955852d768eb06f24138214870d543abb1a47346fba
@@ -256,12 +256,12 @@ F ext/misc/amatch.c 6db4607cb17c54b853a2d7c7c36046d004853f65b9b733e6f019d543d5df
 F ext/misc/anycollseq.c 5ffdfde9829eeac52219136ad6aa7cd9a4edb3b15f4f2532de52f4a22525eddb
 F ext/misc/carray.c 40c27641010a4dc67e3690bdb7c9d36ca58b3c2d
 F ext/misc/closure.c 0d2a038df8fbae7f19de42e7c7d71f2e4dc88704
-F ext/misc/completion.c 821141b02a0313ce7dbe72f0260ef755f81d4b57eacb799864e4c40ad5ceb3f3
+F ext/misc/completion.c 52c3f01523e3e387eb321b4739a89d1fe47cbe6025aa1f2d8d3685e9e365df0f
 F ext/misc/compress.c 122faa92d25033d6c3f07c39231de074ab3d2e83
 F ext/misc/csv.c d91c0388445b08f6e373dd0e8fc024d4551b1fcaf64e876a1c3f4fac8a63adc2
 F ext/misc/dbdump.c 3509fa6b8932d04e932d6b6b827b6a82ca362781b8e8f3c77336f416793e215e
 F ext/misc/eval.c f971962e92ebb8b0a4e6b62949463ee454d88fa2
-F ext/misc/fileio.c d4171c815d6543a9edef8308aab2951413cd8d0f
+F ext/misc/fileio.c b1aa06c0f1dac277695d4529e5e976c65ab5678dcbb53a0304deaa8adc44b332
 F ext/misc/fuzzer.c 7c64b8197bb77b7d64eff7cac7848870235d4c25
 F ext/misc/ieee754.c f190d0cc5182529acb15babd177781be1ac1718c
 F ext/misc/json1.c dbe086615b9546c156bf32b9378fc09383b58bd17513b866cfd24c1e15281984
@@ -392,7 +392,7 @@ F src/auth.c 79f96c6f33bf0e5da8d1c282cee5ebb1852bb8a6ccca3e485d7c459b035d9c3c
 F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
 F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
-F src/btree.c 79fb003347c47c74f8fda24f2fd332321da616771cd3d1b3258b739f569ec625
+F src/btree.c f55ea8f456d103328d61076be40fa39acbfea05eaa4eccfed275532a63c867c4
 F src/btree.h 3edc5329bc59534d2d15b4f069a9f54b779a7e51289e98fa481ae3c0e526a5ca
 F src/btreeInt.h 97700795edf8a43245720414798b7b29d8e465aef46bf301ffacd431910c0da1
 F src/build.c 74108007d286232fb4290464ee5452fa860c26215f8caa0e6c7cbf69a6fafe8f
@@ -450,12 +450,12 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 6aa1fb1212e601f65b983ee1215d69a591986c8f97a3805c425c625a53839539
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c 6aa7e8ee53dcb9d0b77b05670bb44a1076d6747bc9b2c1f12a365b553ab6c828
-F src/shell.c 19726a6f28f66aa0488f5e9c7aacc399f2bbcd934bffc3a92a5de6d365389eee
-F src/shell.c.in 18510e3fdd9216a6183ff93a48cac7d8d253d39f17750af597d90d3c5f27fc34
+F src/shell.c 0401a716fc5343594b8ee60ce065d9a71373d3403f0b81f9fed684741e6401d1
+F src/shell.c.in 98bfdeeb0808418b37f59e6d380568a76e0733efe2494377096f434b39940cad
 F src/sqlite.h.in 03a422ba13da1dfef7f1aaa1ba344acf18dc867112620b1fdb2a1426cabba634
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 5539ec41f3d81890d626d5a845b08c82bd0e946ddc5c1c341144b700bc56101e
-F src/sqliteInt.h 7a7cd6f682471cce4afe64216f71fd64c622712aeb9d947c33c38337a7cf19a9
+F src/sqliteInt.h c9cc829906fc9c95444c6c3b4a7dbf8eac39af15cde5582e869ae5c9b4eebef9
 F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
 F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
 F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@ -1631,7 +1631,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 b9debd626a68c4bc0e5fdeb8d15a991cfe6f62f9586eda76c07a1c18e498e3c2
-R 8745ce1c706502301f89ec6738b13039
-U mistachkin
-Z 63dd27d75b2c25ef4e26d8f81d95be48
+P 2fe3a84330063378ca9fc5bfc8efe486c52d50b5c40be4f402a4f2318be69436
+R 5233df6163d8e8ff9a79e293df00de6c
+U drh
+Z d9b035cf4c291f130c8cdbd2d8e35ec0

diff --git a/manifest.uuid b/manifest.uuid
index dba55a945d4e6be7a751843e712c2f5d2c23489d..74c8ab24ec59fc8a6da3990ca89007196dbddd65 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2fe3a84330063378ca9fc5bfc8efe486c52d50b5c40be4f402a4f2318be69436
\ No newline at end of file
+55e93f256018757e5e1cb3b10ef48abf5914e7687419eae58b00998a37061261
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 406a2b4282afb905506186986282befa3ac0eabf..4d38315f309ca25a827641ff4756b9f9e7f5384c 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -5449,19 +5449,19 @@ i64 sqlite3BtreeRowCountEst(BtCursor *pCur){
 ** routine is called when it is necessary to move to a different page or
 ** to restore the cursor.
 **
-** If bit 0x01 of the flags argument is 1, then the cursor corresponds to
-** an SQL index and this routine could have been skipped if the SQL index
-** had been a unique index.  The flags argument is a hint to the implement.
-** SQLite btree implementation does not use this hint, but COMDB2 does.
+** If bit 0x01 of the F argument in sqlite3BtreeNext(C,F) is 1, then the
+** cursor corresponds to an SQL index and this routine could have been
+** skipped if the SQL index had been a unique index.  The F argument
+** is a hint to the implement.  SQLite btree implementation does not use
+** this hint, but COMDB2 does.
 */
-static SQLITE_NOINLINE int btreeNext(BtCursor *pCur, int flags){
+static SQLITE_NOINLINE int btreeNext(BtCursor *pCur){
   int rc;
   int idx;
   MemPage *pPage;
 
   assert( cursorOwnsBtShared(pCur) );
   assert( pCur->skipNext==0 || pCur->eState!=CURSOR_VALID );
-  assert( flags==0 );
   if( pCur->eState!=CURSOR_VALID ){
     assert( (pCur->curFlags & BTCF_ValidOvfl)==0 );
     rc = restoreCursorPosition(pCur);
@@ -5508,7 +5508,7 @@ static SQLITE_NOINLINE int btreeNext(BtCursor *pCur, int flags){
       pPage = pCur->apPage[pCur->iPage];
     }while( pCur->ix>=pPage->nCell );
     if( pPage->intKey ){
-      return sqlite3BtreeNext(pCur, flags);
+      return sqlite3BtreeNext(pCur, 0);
     }else{
       return SQLITE_OK;
     }
@@ -5521,16 +5521,17 @@ static SQLITE_NOINLINE int btreeNext(BtCursor *pCur, int flags){
 }
 int sqlite3BtreeNext(BtCursor *pCur, int flags){
   MemPage *pPage;
+  UNUSED_PARAMETER( flags );  /* Used in COMDB2 but not native SQLite */
   assert( cursorOwnsBtShared(pCur) );
   assert( flags==0 || flags==1 );
   assert( pCur->skipNext==0 || pCur->eState!=CURSOR_VALID );
   pCur->info.nSize = 0;
   pCur->curFlags &= ~(BTCF_ValidNKey|BTCF_ValidOvfl);
-  if( pCur->eState!=CURSOR_VALID ) return btreeNext(pCur, 0);
+  if( pCur->eState!=CURSOR_VALID ) return btreeNext(pCur);
   pPage = pCur->apPage[pCur->iPage];
   if( (++pCur->ix)>=pPage->nCell ){
     pCur->ix--;
-    return btreeNext(pCur, 0);
+    return btreeNext(pCur);
   }
   if( pPage->leaf ){
     return SQLITE_OK;
@@ -5553,18 +5554,17 @@ int sqlite3BtreeNext(BtCursor *pCur, int flags){
 ** helper routine is called when it is necessary to move to a different page
 ** or to restore the cursor.
 **
-**
-** If bit 0x01 of the flags argument is 1, then the cursor corresponds to
-** an SQL index and this routine could have been skipped if the SQL index
-** had been a unique index.  The flags argument is a hint to the implement.
-** SQLite btree implementation does not use this hint, but COMDB2 does.
+** If bit 0x01 of the F argument to sqlite3BtreePrevious(C,F) is 1, then
+** the cursor corresponds to an SQL index and this routine could have been
+** skipped if the SQL index had been a unique index.  The F argument is a
+** hint to the implement.  The native SQLite btree implementation does not
+** use this hint, but COMDB2 does.
 */
-static SQLITE_NOINLINE int btreePrevious(BtCursor *pCur, int flags){
+static SQLITE_NOINLINE int btreePrevious(BtCursor *pCur){
   int rc;
   MemPage *pPage;
 
   assert( cursorOwnsBtShared(pCur) );
-  assert( flags==0 );
   assert( pCur->skipNext==0 || pCur->eState!=CURSOR_VALID );
   assert( (pCur->curFlags & (BTCF_AtLast|BTCF_ValidOvfl|BTCF_ValidNKey))==0 );
   assert( pCur->info.nSize==0 );
@@ -5608,7 +5608,7 @@ static SQLITE_NOINLINE int btreePrevious(BtCursor *pCur, int flags){
     pCur->ix--;
     pPage = pCur->apPage[pCur->iPage];
     if( pPage->intKey && !pPage->leaf ){
-      rc = sqlite3BtreePrevious(pCur, flags);
+      rc = sqlite3BtreePrevious(pCur, 0);
     }else{
       rc = SQLITE_OK;
     }
@@ -5619,13 +5619,14 @@ int sqlite3BtreePrevious(BtCursor *pCur, int flags){
   assert( cursorOwnsBtShared(pCur) );
   assert( flags==0 || flags==1 );
   assert( pCur->skipNext==0 || pCur->eState!=CURSOR_VALID );
+  UNUSED_PARAMETER( flags );  /* Used in COMDB2 but not native SQLite */
   pCur->curFlags &= ~(BTCF_AtLast|BTCF_ValidOvfl|BTCF_ValidNKey);
   pCur->info.nSize = 0;
   if( pCur->eState!=CURSOR_VALID
    || pCur->ix==0
    || pCur->apPage[pCur->iPage]->leaf==0
   ){
-    return btreePrevious(pCur, 0);
+    return btreePrevious(pCur);
   }
   pCur->ix--;
   return SQLITE_OK;

diff --git a/src/shell.c b/src/shell.c
index 443304616cd7e90ddd019a02ca17b4a40f31db69..4fe0fd3856b4698cdd1d0d8434cc962717765e4c 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -784,7 +784,7 @@ static void shellAddSchemaName(
   const char *zSchema = (const char*)sqlite3_value_text(apVal[1]);
   assert( nVal==2 );
   if( zIn!=0 && strncmp(zIn, "CREATE ", 7)==0 ){
-    for(i=0; i<sizeof(aPrefix)/sizeof(aPrefix[0]); i++){
+    for(i=0; i<(int)(sizeof(aPrefix)/sizeof(aPrefix[0])); i++){
       int n = strlen30(aPrefix[i]);
       if( strncmp(zIn+7, aPrefix[i], n)==0 && zIn[n+7]==' ' ){
         char cQuote = quoteChar(zSchema);
@@ -809,7 +809,7 @@ static void shellAddSchemaName(
 ** work here in the middle of this regular program.
 */
 #define SQLITE_EXTENSION_INIT1
-#define SQLITE_EXTENSION_INIT2(X)
+#define SQLITE_EXTENSION_INIT2(X) (void)(X)
 
 /************************* Begin ../ext/misc/shathree.c ******************/
 /*
@@ -1561,6 +1561,7 @@ static void readfileFunc(
   long nIn;
   void *pBuf;
 
+  (void)(argc);  /* Unused parameter */
   zName = (const char*)sqlite3_value_text(argv[0]);
   if( zName==0 ) return;
   in = fopen(zName, "rb");
@@ -1593,6 +1594,7 @@ static void writefileFunc(
   sqlite3_int64 rc;
   const char *zFile;
 
+  (void)(argc);  /* Unused parameter */
   zFile = (const char*)sqlite3_value_text(argv[0]);
   if( zFile==0 ) return;
   out = fopen(zFile, "wb");
@@ -1737,6 +1739,11 @@ static int completionConnect(
   completion_vtab *pNew;
   int rc;
 
+  (void)(pAux);    /* Unused parameter */
+  (void)(argc);    /* Unused parameter */
+  (void)(argv);    /* Unused parameter */
+  (void)(pzErr);   /* Unused parameter */
+
 /* Column numbers */
 #define COMPLETION_COLUMN_CANDIDATE 0  /* Suggested completion of the input */
 #define COMPLETION_COLUMN_PREFIX    1  /* Prefix of the word to be completed */
@@ -1823,6 +1830,8 @@ static const char *completionKwrds[] = {
   "UPDATE", "USING", "VACUUM", "VALUES", "VIEW", "VIRTUAL", "WHEN", "WHERE",
   "WITH", "WITHOUT",
 };
+#define completionKwCount \
+   (int)(sizeof(completionKwrds)/sizeof(completionKwrds[0]))
 
 /*
 ** Advance a completion_cursor to its next row of output.
@@ -1846,7 +1855,7 @@ static int completionNext(sqlite3_vtab_cursor *cur){
   while( pCur->ePhase!=COMPLETION_EOF ){
     switch( pCur->ePhase ){
       case COMPLETION_KEYWORDS: {
-        if( pCur->j >=  sizeof(completionKwrds)/sizeof(completionKwrds[0]) ){
+        if( pCur->j >= completionKwCount ){
           pCur->zCurrentRow = 0;
           pCur->ePhase = COMPLETION_DATABASES;
         }else{
@@ -2003,6 +2012,8 @@ static int completionFilter(
 ){
   completion_cursor *pCur = (completion_cursor *)pVtabCursor;
   int iArg = 0;
+  (void)(idxStr);   /* Unused parameter */
+  (void)(argc);     /* Unused parameter */
   completionCursorReset(pCur);
   if( idxNum & 1 ){
     pCur->nPrefix = sqlite3_value_bytes(argv[iArg]);
@@ -2057,6 +2068,7 @@ static int completionBestIndex(
   int nArg = 0;          /* Number of arguments that completeFilter() expects */
   const struct sqlite3_index_constraint *pConstraint;
 
+  (void)(tab);    /* Unused parameter */
   pConstraint = pIdxInfo->aConstraint;
   for(i=0; i<pIdxInfo->nConstraint; i++, pConstraint++){
     if( pConstraint->usable==0 ) continue;
@@ -2111,6 +2123,9 @@ static sqlite3_module completionModule = {
   0,                         /* xRollback */
   0,                         /* xFindMethod */
   0,                         /* xRename */
+  0,                         /* xSavepoint */
+  0,                         /* xRelease */
+  0                          /* xRollbackTo */
 };
 
 #endif /* SQLITE_OMIT_VIRTUALTABLE */
@@ -2133,6 +2148,7 @@ int sqlite3_completion_init(
 ){
   int rc = SQLITE_OK;
   SQLITE_EXTENSION_INIT2(pApi);
+  (void)(pzErrMsg);  /* Unused parameter */
 #ifndef SQLITE_OMIT_VIRTUALTABLE
   rc = sqlite3CompletionVtabInit(db);
 #endif

diff --git a/src/shell.c.in b/src/shell.c.in
index 72d07799ba5a837c383985427565ed436fad864c..3c577727675b49d307f409661d084f2dd6245757 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -766,7 +766,7 @@ static void shellAddSchemaName(
   const char *zSchema = (const char*)sqlite3_value_text(apVal[1]);
   assert( nVal==2 );
   if( zIn!=0 && strncmp(zIn, "CREATE ", 7)==0 ){
-    for(i=0; i<sizeof(aPrefix)/sizeof(aPrefix[0]); i++){
+    for(i=0; i<(int)(sizeof(aPrefix)/sizeof(aPrefix[0])); i++){
       int n = strlen30(aPrefix[i]);
       if( strncmp(zIn+7, aPrefix[i], n)==0 && zIn[n+7]==' ' ){
         char cQuote = quoteChar(zSchema);
@@ -791,7 +791,7 @@ static void shellAddSchemaName(
 ** work here in the middle of this regular program.
 */
 #define SQLITE_EXTENSION_INIT1
-#define SQLITE_EXTENSION_INIT2(X)
+#define SQLITE_EXTENSION_INIT2(X) (void)(X)
 
 INCLUDE ../ext/misc/shathree.c
 INCLUDE ../ext/misc/fileio.c

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 4acd100be24521ef769230f78ad84ae50cdcb90f..2e18b8cc930aa3203b66249108794e6db986797f 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -4378,6 +4378,8 @@ Expr *sqlite3VectorFieldSubexpr(Expr*, int);
 Expr *sqlite3ExprForVectorField(Parse*,Expr*,int);
 void sqlite3VectorErrorMsg(Parse*, Expr*);
 
+#ifndef SQLITE_OMIT_COMPILEOPTION_DIAGS
 const char **sqlite3CompileOptions(int *pnOpt);
+#endif
 
 #endif /* SQLITEINT_H */