From: drh <drh@noemail.net>
Date: Wed, 25 May 2011 23:18:02 +0000 (+0000)
Subject: Fix some minor and harmless compiler warnings.
X-Git-Tag: version-3.7.7~92
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7ee4fdd7ba0366a929adb5c94297f9debcf4a4b3;p=thirdparty%2Fsqlite.git

Fix some minor and harmless compiler warnings.

FossilOrigin-Name: a4755e7088c3cc7c5ea191ce37f3950472f523ec
---

diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c
index 5e2472753e..0aba0546c3 100644
--- a/ext/fts3/fts3.c
+++ b/ext/fts3/fts3.c
@@ -3665,6 +3665,7 @@ static int fts3RenameMethod(
 
 static int fts3SavepointMethod(sqlite3_vtab *pVtab, int iSavepoint){
   Fts3Table *p = (Fts3Table*)pVtab;
+  UNUSED_PARAMETER(iSavepoint);
   assert( p->inTransaction );
   assert( p->mxSavepoint < iSavepoint );
   TESTONLY( p->mxSavepoint = iSavepoint );
@@ -3672,6 +3673,8 @@ static int fts3SavepointMethod(sqlite3_vtab *pVtab, int iSavepoint){
 }
 static int fts3ReleaseMethod(sqlite3_vtab *pVtab, int iSavepoint){
   TESTONLY( Fts3Table *p = (Fts3Table*)pVtab );
+  UNUSED_PARAMETER(iSavepoint);
+  UNUSED_PARAMETER(pVtab);
   assert( p->inTransaction );
   assert( p->mxSavepoint >= iSavepoint );
   TESTONLY( p->mxSavepoint = iSavepoint-1 );
@@ -3679,6 +3682,7 @@ static int fts3ReleaseMethod(sqlite3_vtab *pVtab, int iSavepoint){
 }
 static int fts3RollbackToMethod(sqlite3_vtab *pVtab, int iSavepoint){
   Fts3Table *p = (Fts3Table*)pVtab;
+  UNUSED_PARAMETER(iSavepoint);
   assert( p->inTransaction );
   assert( p->mxSavepoint >= iSavepoint );
   TESTONLY( p->mxSavepoint = iSavepoint );
diff --git a/ext/fts3/fts3_aux.c b/ext/fts3/fts3_aux.c
index 6108689ae1..cd035d2a30 100644
--- a/ext/fts3/fts3_aux.c
+++ b/ext/fts3/fts3_aux.c
@@ -342,6 +342,7 @@ static int fts3auxFilterMethod(
   int isScan;
 
   UNUSED_PARAMETER(nVal);
+  UNUSED_PARAMETER(idxStr);
 
   assert( idxStr==0 );
   assert( idxNum==FTS4AUX_EQ_CONSTRAINT || idxNum==0
@@ -459,7 +460,10 @@ int sqlite3Fts3InitAux(sqlite3 *db){
      0,                           /* xCommit       */
      0,                           /* xRollback     */
      0,                           /* xFindFunction */
-     0                            /* xRename       */
+     0,                           /* xRename       */
+     0,                           /* xSavepoint    */
+     0,                           /* xRelease      */
+     0                            /* xRollbackTo   */
   };
   int rc;                         /* Return code */
 
diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c
index 6e00827b46..66a10df1c3 100644
--- a/ext/rtree/rtree.c
+++ b/ext/rtree/rtree.c
@@ -2849,7 +2849,7 @@ static int rtreeRename(sqlite3_vtab *pVtab, const char *zNewName){
 }
 
 static sqlite3_module rtreeModule = {
-  0,                         /* iVersion */
+  0,                          /* iVersion */
   rtreeCreate,                /* xCreate - create a table */
   rtreeConnect,               /* xConnect - connect to an existing table */
   rtreeBestIndex,             /* xBestIndex - Determine search strategy */
@@ -2868,7 +2868,10 @@ static sqlite3_module rtreeModule = {
   0,                          /* xCommit - commit transaction */
   0,                          /* xRollback - rollback transaction */
   0,                          /* xFindFunction - function overloading */
-  rtreeRename                 /* xRename - rename the table */
+  rtreeRename,                /* xRename - rename the table */
+  0,                          /* xSavepoint */
+  0,                          /* xRelease */
+  0                           /* xRollbackTo */
 };
 
 static int rtreeSqlInit(
diff --git a/manifest b/manifest
index bd65c3d5e3..bd8d6e5ef2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ignore\smalloc\sfailures\swithin\sthe\sWAL\sfile\struncation\sattempt\sfor\njournal_size_limit.
-D 2011-05-25T20:25:10.559
+C Fix\ssome\sminor\sand\sharmless\scompiler\swarnings.
+D 2011-05-25T23:18:02.794
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 11dcc00a8d0e5202def00e81732784fb0cc4fe1d
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -61,10 +61,10 @@ F ext/fts2/mkfts2amal.tcl 974d5d438cb3f7c4a652639262f82418c1e4cff0
 F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a
 F ext/fts3/README.tokenizers 998756696647400de63d5ba60e9655036cb966e9
 F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
-F ext/fts3/fts3.c 0a2ae110f2d1806687ee0de837ac1eff106843b4
+F ext/fts3/fts3.c b3a10a1a320aaeb56a1dd6710bf09eb5c2370839
 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
 F ext/fts3/fts3Int.h c8c0011c5e5b3a7703376ea6cd7deb91cfb96a06
-F ext/fts3/fts3_aux.c 9e931f55eed8498dafe7bc1160f10cbb1a652fdf
+F ext/fts3/fts3_aux.c 97c960b1b0d371c08eae6b8565dfac619eb9d979
 F ext/fts3/fts3_expr.c 5f49e0deaf723724b08100bb3ff40aab02ad0c93
 F ext/fts3/fts3_hash.c 3c8f6387a4a7f5305588b203fa7c887d753e1f1c
 F ext/fts3/fts3_hash.h 8331fb2206c609f9fc4c4735b9ab5ad6137c88ec
@@ -82,7 +82,7 @@ F ext/icu/README.txt bf8461d8cdc6b8f514c080e4e10dc3b2bbdfefa9
 F ext/icu/icu.c eb9ae1d79046bd7871aa97ee6da51eb770134b5a
 F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
-F ext/rtree/rtree.c 2445bec932f58f8f4fe9de49a63bd6bf24db82d6
+F ext/rtree/rtree.c 4b8438444927191b55de18e00df43b2e02aacbda
 F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
 F ext/rtree/rtree1.test 28e1b8da4da98093ce3210187434dd760a8d89d8
 F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@ -938,7 +938,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P d807304a695fc85402b86e1cd32a6e3bbb2823c8
-R 40f4c0754c95b7a51c08aa03886ff26c
+P dd19105aa9521ffc0edcf16b84c064d5ebad55d7
+R 008aea5da6bfc4eb7e4a2c09eb3620eb
 U drh
-Z c74bad4333e073e26c4db5e166f8f584
+Z e8c2f21e52caf9d88919dc2348e8bfe9
diff --git a/manifest.uuid b/manifest.uuid
index f139bfb8f7..310e58b317 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dd19105aa9521ffc0edcf16b84c064d5ebad55d7
\ No newline at end of file
+a4755e7088c3cc7c5ea191ce37f3950472f523ec
\ No newline at end of file