From: drh <drh@noemail.net>
Date: Tue, 18 Jul 2017 20:22:12 +0000 (+0000)
Subject: Suppress harmless compiler warnings in union-vtab.
X-Git-Tag: version-3.20.0~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=65e0f114517622d6eb5cb63bb57283276c1ee165;p=thirdparty%2Fsqlite.git

Suppress harmless compiler warnings in union-vtab.

FossilOrigin-Name: 4d147a1e28b93e267889fcb01b538d6a2a58d6b1655512c883fa5b53ddcc60a4
---

diff --git a/ext/misc/unionvtab.c b/ext/misc/unionvtab.c
index eb17db78bf..6c7881040a 100644
--- a/ext/misc/unionvtab.c
+++ b/ext/misc/unionvtab.c
@@ -406,6 +406,7 @@ static int unionConnect(
   UnionTab *pTab = 0;
   int rc = SQLITE_OK;
 
+  (void)pAux;   /* Suppress harmless 'unused parameter' warning */
   if( sqlite3_stricmp("temp", argv[1]) ){
     /* unionvtab tables may only be created in the temp schema */
     *pzErr = sqlite3_mprintf("unionvtab tables must be created in TEMP schema");
@@ -510,6 +511,7 @@ static int unionConnect(
 static int unionOpen(sqlite3_vtab *p, sqlite3_vtab_cursor **ppCursor){
   UnionCsr *pCsr;
   int rc = SQLITE_OK;
+  (void)p;  /* Suppress harmless warning */
   pCsr = (UnionCsr*)unionMalloc(&rc, sizeof(UnionCsr));
   *ppCursor = &pCsr->base;
   return rc;
@@ -599,6 +601,8 @@ static int unionFilter(
        || idxNum==(SQLITE_INDEX_CONSTRAINT_GE|SQLITE_INDEX_CONSTRAINT_LE)
   );
 
+  (void)idxStr;  /* Suppress harmless warning */
+  
   if( idxNum==SQLITE_INDEX_CONSTRAINT_EQ ){
     assert( argc==1 );
     iMin = iMax = sqlite3_value_int64(argv[0]);
@@ -784,6 +788,9 @@ static int createUnionVtab(sqlite3 *db){
     0,                            /* xRollback */
     0,                            /* xFindMethod */
     0,                            /* xRename */
+    0,                            /* xSavepoint */
+    0,                            /* xRelease */
+    0                             /* xRollbackTo */
   };
 
   return sqlite3_create_module(db, "unionvtab", &unionModule, 0);
@@ -801,9 +808,9 @@ int sqlite3_unionvtab_init(
 ){
   int rc = SQLITE_OK;
   SQLITE_EXTENSION_INIT2(pApi);
+  (void)pzErrMsg;  /* Suppress harmless warning */
 #ifndef SQLITE_OMIT_VIRTUALTABLE
   rc = createUnionVtab(db);
 #endif
   return rc;
 }
-
diff --git a/manifest b/manifest
index 7f3a35907f..bc41c2fa7c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\sunused\svariable\sfrom\sunionvtab.c.
-D 2017-07-18T20:17:52.099
+C Suppress\sharmless\scompiler\swarnings\sin\sunion-vtab.
+D 2017-07-18T20:22:12.246
 F Makefile.in d9873c9925917cca9990ee24be17eb9613a668012c85a343aef7e5536ae266e8
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 20850e3e8d4d4791e0531955852d768eb06f24138214870d543abb1a47346fba
@@ -281,7 +281,7 @@ F ext/misc/showauth.c 732578f0fe4ce42d577e1c86dc89dd14a006ab52
 F ext/misc/spellfix.c a4723b6aff748a417b5091b68a46443265c40f0d
 F ext/misc/stmt.c 6f16443abb3551e3f5813bb13ba19a30e7032830015b0f92fe0c0453045c0a11
 F ext/misc/totype.c 4a167594e791abeed95e0a8db028822b5e8fe512
-F ext/misc/unionvtab.c 270ebaa9f5a7d283f9aeeb50605dbd243bde111b5ee9f5f5765b3f1a7998a71c
+F ext/misc/unionvtab.c 82e3531e24b4671d74b9e92d737ac8a6864c5d63cc7fac3c21a0bd285f3f1a9f
 F ext/misc/vfslog.c fe40fab5c077a40477f7e5eba994309ecac6cc95
 F ext/misc/vfsstat.c bf10ef0bc51e1ad6756629e1edb142f7a8db1178
 F ext/misc/vtshim.c 1976e6dd68dd0d64508c91a6dfab8e75f8aaf6cd
@@ -1635,7 +1635,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 5bcf0f86ea7fbbc31a13b2d5b1cf93a92e46fb65fe8e779b3d7e4a98d60d7061
-R 33f90b952409aeaf28122c0e9ad9167d
-U dan
-Z 29489a901bd7715b1c7e8c4ddf6a1303
+P a447fdf182c9090ca5b6c9c13147ae4b78d22d67f416ee7a0436ca408284c8fe
+R 8ea1a872ebb79e713f4131066de4ea3c
+U drh
+Z 15a27884ea99ea71b300076329bdc8ab
diff --git a/manifest.uuid b/manifest.uuid
index 6ced47f601..1642731bbc 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a447fdf182c9090ca5b6c9c13147ae4b78d22d67f416ee7a0436ca408284c8fe
\ No newline at end of file
+4d147a1e28b93e267889fcb01b538d6a2a58d6b1655512c883fa5b53ddcc60a4
\ No newline at end of file