From: drh <drh@noemail.net>
Date: Wed, 25 Nov 2020 16:28:04 +0000 (+0000)
Subject: Fix harmless compiler warnings about unused function parameters.
X-Git-Tag: version-3.34.0~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d36f588f3135d03687f8e5ad70563054ed54206c;p=thirdparty%2Fsqlite.git

Fix harmless compiler warnings about unused function parameters.

FossilOrigin-Name: 25d067c270966d9506db8bedf280883e32b69050b14bdbbeda4bb2d9a362619c
---

diff --git a/Makefile.in b/Makefile.in
index bc0b7a705b..6ab49dbe9a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1087,6 +1087,7 @@ SHELL_SRC = \
         $(TOP)/ext/misc/decimal.c \
 	$(TOP)/ext/misc/fileio.c \
         $(TOP)/ext/misc/ieee754.c \
+        $(TOP)/ext/misc/series.c \
 	$(TOP)/ext/misc/shathree.c \
 	$(TOP)/ext/misc/sqlar.c \
         $(TOP)/ext/misc/uint.c \
diff --git a/Makefile.msc b/Makefile.msc
index 2e7ef3a055..404e3b2360 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -2209,6 +2209,7 @@ SHELL_SRC = \
         $(TOP)\ext\misc\decimal.c \
 	$(TOP)\ext\misc\fileio.c \
         $(TOP)\ext\misc\ieee754.c \
+        $(TOP)\ext\misc\series.c \
 	$(TOP)\ext\misc\shathree.c \
 	$(TOP)\ext\misc\uint.c \
 	$(TOP)\ext\expert\sqlite3expert.c \
diff --git a/ext/fts5/fts5_tokenize.c b/ext/fts5/fts5_tokenize.c
index aa519f868d..e61d6b1edd 100644
--- a/ext/fts5/fts5_tokenize.c
+++ b/ext/fts5/fts5_tokenize.c
@@ -1277,13 +1277,14 @@ static void fts5TriDelete(Fts5Tokenizer *p){
 ** Allocate a trigram tokenizer.
 */
 static int fts5TriCreate(
-  void *pCtx,
+  void *pUnused,
   const char **azArg,
   int nArg,
   Fts5Tokenizer **ppOut
 ){
   int rc = SQLITE_OK;
   TrigramTokenizer *pNew = (TrigramTokenizer*)sqlite3_malloc(sizeof(*pNew));
+  UNUSED_PARAM(pUnused);
   if( pNew==0 ){
     rc = SQLITE_NOMEM;
   }else{
@@ -1316,7 +1317,7 @@ static int fts5TriCreate(
 static int fts5TriTokenize(
   Fts5Tokenizer *pTok,
   void *pCtx,
-  int flags,
+  int unusedFlags,
   const char *pText, int nText,
   int (*xToken)(void*, int, const char*, int, int, int)
 ){
@@ -1327,6 +1328,7 @@ static int fts5TriTokenize(
   const unsigned char *zEof = &zIn[nText];
   u32 iCode;
 
+  UNUSED_PARAM(unusedFlags);
   while( 1 ){
     char *zOut = aBuf;
     int iStart = zIn - (const unsigned char*)pText;
diff --git a/ext/misc/series.c b/ext/misc/series.c
index ac93f1fc4c..092383e57e 100644
--- a/ext/misc/series.c
+++ b/ext/misc/series.c
@@ -106,10 +106,10 @@ struct series_cursor {
 */
 static int seriesConnect(
   sqlite3 *db,
-  void *pAux,
-  int argc, const char *const*argv,
+  void *pUnused,
+  int argcUnused, const char *const*argvUnused,
   sqlite3_vtab **ppVtab,
-  char **pzErr
+  char **pzErrUnused
 ){
   sqlite3_vtab *pNew;
   int rc;
@@ -120,6 +120,10 @@ static int seriesConnect(
 #define SERIES_COLUMN_STOP  2
 #define SERIES_COLUMN_STEP  3
 
+  (void)pUnused;
+  (void)argcUnused;
+  (void)argvUnused;
+  (void)pzErrUnused;
   rc = sqlite3_declare_vtab(db,
      "CREATE TABLE x(value,start hidden,stop hidden,step hidden)");
   if( rc==SQLITE_OK ){
@@ -142,8 +146,9 @@ static int seriesDisconnect(sqlite3_vtab *pVtab){
 /*
 ** Constructor for a new series_cursor object.
 */
-static int seriesOpen(sqlite3_vtab *p, sqlite3_vtab_cursor **ppCursor){
+static int seriesOpen(sqlite3_vtab *pUnused, sqlite3_vtab_cursor **ppCursor){
   series_cursor *pCur;
+  (void)pUnused;
   pCur = sqlite3_malloc( sizeof(*pCur) );
   if( pCur==0 ) return SQLITE_NOMEM;
   memset(pCur, 0, sizeof(*pCur));
@@ -250,11 +255,12 @@ static int seriesEof(sqlite3_vtab_cursor *cur){
 */
 static int seriesFilter(
   sqlite3_vtab_cursor *pVtabCursor, 
-  int idxNum, const char *idxStr,
+  int idxNum, const char *idxStrUnused,
   int argc, sqlite3_value **argv
 ){
   series_cursor *pCur = (series_cursor *)pVtabCursor;
   int i = 0;
+  (void)idxStrUnused;
   if( idxNum & 1 ){
     pCur->mnValue = sqlite3_value_int64(argv[i++]);
   }else{
@@ -311,7 +317,7 @@ static int seriesFilter(
 **  (8)  output in descending order
 */
 static int seriesBestIndex(
-  sqlite3_vtab *tab,
+  sqlite3_vtab *tabUnused,
   sqlite3_index_info *pIdxInfo
 ){
   int i, j;              /* Loop over constraints */
@@ -325,6 +331,7 @@ static int seriesBestIndex(
   ** are the last three columns in the virtual table. */
   assert( SERIES_COLUMN_STOP == SERIES_COLUMN_START+1 );
   assert( SERIES_COLUMN_STEP == SERIES_COLUMN_START+2 );
+  (void)tabUnused;
   aIdx[0] = aIdx[1] = aIdx[2] = -1;
   pConstraint = pIdxInfo->aConstraint;
   for(i=0; i<pIdxInfo->nConstraint; i++, pConstraint++){
@@ -398,6 +405,10 @@ static sqlite3_module seriesModule = {
   0,                         /* xRollback */
   0,                         /* xFindMethod */
   0,                         /* xRename */
+  0,                         /* xSavepoint */
+  0,                         /* xRelease */
+  0,                         /* xRollbackTo */
+  0                          /* xShadowName */
 };
 
 #endif /* SQLITE_OMIT_VIRTUALTABLE */
diff --git a/manifest b/manifest
index 8540da5c04..75358f32be 100644
--- a/manifest
+++ b/manifest
@@ -1,11 +1,11 @@
-C Fix\sa\spotential\sNULL\spointer\sdereference\sin\sthe\sgeopoly_overlap()\sroutine\nof\sthe\sGeoPoly\sextension.
-D 2020-11-25T15:29:08.250
+C Fix\sharmless\scompiler\swarnings\sabout\sunused\sfunction\sparameters.
+D 2020-11-25T16:28:04.565
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in fcc4655e4bab5bc86d5bcf08d491dac6b7cb54236d2fff0b2460ca3c00114d8d
+F Makefile.in 0e88f5d095213a9ccd45c5bbd871c8ead498f886dff4493471fbf48b1f867f9d
 F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
-F Makefile.msc 5c2692c5a8f6d1b9482e970522a8b412140885d7faca76fd9cdfc80d67e89d31
+F Makefile.msc dd10dbf63b2f8ac3e2f0542963a21bc69058976ac4355165f212a31c83d17f44
 F README.md 1514a365ffca3c138e00c5cc839906108a01011a6b082bad19b09781e3aa498a
 F VERSION 4027b9aea92d64385570778ebd14388c0b23e92aafda15e7b89c45886c9b920a
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -125,7 +125,7 @@ F ext/fts5/fts5_storage.c 58ba71e6cd3d43a5735815e7956ee167babb4d2cbfe20690517479
 F ext/fts5/fts5_tcl.c 39bcbae507f594aad778172fa914cad0f585bf92fd3b078c686e249282db0d95
 F ext/fts5/fts5_test_mi.c 08c11ec968148d4cb4119d96d819f8c1f329812c568bac3684f5464be177d3ee
 F ext/fts5/fts5_test_tok.c f96c6e193c466711d6d7828d5f190407fe7ab897062d371426dd3036f01258e7
-F ext/fts5/fts5_tokenize.c 6f47244681c670ec3c1364f19b2ec0cca191249ff3543755a65e1fc1df348061
+F ext/fts5/fts5_tokenize.c 5e251efb0f1af99a25ed50010ba6b1ad1250aca5921af1988fdcabe5ebc3cb43
 F ext/fts5/fts5_unicode2.c 85f64663cbd8ddd09d3a1e8823759b07085018b4a53158632e264cd785f88763
 F ext/fts5/fts5_varint.c e64d2113f6e1bfee0032972cffc1207b77af63319746951bf1d09885d1dadf80
 F ext/fts5/fts5_vocab.c 7a071833064dc8bca236c3c323e56aac36f583aa2c46ce916d52e31ce87462c9
@@ -318,7 +318,7 @@ F ext/misc/regexp.c 246244c714267f303df76acf73dcf110cf2eaf076896aaaba8db6d6d21a1
 F ext/misc/remember.c add730f0f7e7436cd15ea3fd6a90fd83c3f706ab44169f7f048438b7d6baa69c
 F ext/misc/rot13.c 51ac5f51e9d5fd811db58a9c23c628ad5f333c173f1fc53c8491a3603d38556c
 F ext/misc/scrub.c 2a44b0d44c69584c0580ad2553f6290a307a49df4668941d2812135bfb96a946
-F ext/misc/series.c 4057dda3579b38ff88b2d3b13b4dd92dbd9d6f90dac2b55c19b0a8ed87ee4959
+F ext/misc/series.c fbb8e6be97b54d10d2f235e163fa2f53a8f4421c66ebd532a233fd1c69c3f522
 F ext/misc/sha1.c c8f2253c8792ffab9517695ea7d88c079f0395a5505eefef5c8198fe184ed5ac
 F ext/misc/shathree.c 135b7c145db4a09b1650c3e7aff9cb538763a9a361e834c015dd1aaf8d5c9a00
 F ext/misc/showauth.c 732578f0fe4ce42d577e1c86dc89dd14a006ab52
@@ -540,7 +540,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 1948a92ca9eab776632816b97e57c61d933474a78aad4f4ef835c916a83dbb1c
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 31387e56f5e6d1adc798dfa04b946001289a61e65acf4615f7b7130f121f3b9c
-F src/shell.c.in b27aea186ecce10a6809fa851fb89e61c13c1c6e1852ed7d53f865bbf4f1c325
+F src/shell.c.in 55113760ae91a05c6ce4558714a1c8fc7a44bf266f735de6e71ea40f79e69830
 F src/sqlite.h.in 457c991c9d2ff483e17e5b5eb1a83c6793516d478cc63a78e1ea7b362e27e678
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 61b38c073d5e1e96a3d45271b257aef27d0d13da2bea5347692ae579475cd95e
@@ -1886,7 +1886,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 9bd15b07e58b1811c2a368ec76059ac683a2c35b163ef4bba01ccb8b7ca7288d
-R 227404ad8ddcf062da3db77df65316a9
+P b5665712e667a20d42a2e892d9d540f4273609eabd56f8178e1d5664280821f3
+R 5853d95465b779778b6d0c5bacf1cb47
 U drh
-Z 263ce2c694b02eb78a24ab57a2771a4e
+Z f29694147a3e76e20297775228c2e92b
diff --git a/manifest.uuid b/manifest.uuid
index dc8982b4e9..7c8fcd70fa 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b5665712e667a20d42a2e892d9d540f4273609eabd56f8178e1d5664280821f3
\ No newline at end of file
+25d067c270966d9506db8bedf280883e32b69050b14bdbbeda4bb2d9a362619c
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index 774a0786ea..2d98d23c2d 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -4441,10 +4441,11 @@ static void shellIdQuote(
 */
 static void shellUSleepFunc(
   sqlite3_context *context, 
-  int argc, 
+  int argcUnused, 
   sqlite3_value **argv
 ){
   int sleep = sqlite3_value_int(argv[0]);
+  (void)argcUnused;
   sqlite3_sleep(sleep/1000);
   sqlite3_result_int(context, sleep);
 }