Remove an unused parameter from sqlite3DequoteExpr. Fix another unrelated

and harmless compiler warning. (CVS 6386)

FossilOrigin-Name: 8589b0fcc51a32188386e442655fd91f421ca7f8

8 files changed, 29 insertions, 31 deletions

diff --git a/manifest b/manifest
index 7daa14b02..fa1b130f8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\spreventing\ssqlite3_extended_errcode()\sfrom\sworking\scorrectly.\s(CVS\s6385)
-D 2009-03-25T15:43:09
+C Remove\san\sunused\sparameter\sfrom\ssqlite3DequoteExpr.\s\sFix\sanother\sunrelated\nand\sharmless\scompiler\swarning.\s(CVS\s6386)
+D 2009-03-25T16:51:43
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -111,7 +111,7 @@ F src/callback.c 73016376d6848ba987709e8c9048d4f0e0776036
 F src/complete.c cb14e06dbe79dee031031f0d9e686ff306afe07c
 F src/date.c 0d804df3bbda46329946a01ff5c75c3f4f135218
 F src/delete.c eb1066b2f35489fee46ad765d2b66386fc7d8adf
-F src/expr.c f30a43302c4c9c513dc8013426f26f6f7925d2e5
+F src/expr.c 14853cd56107292de6af664a24c6255111a4257d
 F src/fault.c dc88c821842157460750d2d61a8a8b4197d047ff
 F src/func.c de2eed7d96365210faecda877c5a12cf440bdf42
 F src/global.c 448419c44ce0701104c2121b0e06919b44514c0c
@@ -136,7 +136,7 @@ F src/mutex_noop.c f5a07671f25a1a9bd7c10ad7107bc2585446200f
 F src/mutex_os2.c 6b5a74f812082a8483c3df05b47bbaac2424b9a0
 F src/mutex_unix.c 2f936339dfef1a4c142db290d575a3509b77315f
 F src/mutex_w32.c f4b6a4a48f1dfff7f0089cba9b5a371691f17b8b
-F src/notify.c 5787adee6f119c7d36fd8937d31d680467e01ca5
+F src/notify.c d71a03ab24f1b4dc78870578a77e118e3d18360f
 F src/os.c c2aa4a7d8bb845222e5c37f56cde377b20c3b087
 F src/os.h fa3f4aa0119ff721a2da4b47ffd74406ac864c05
 F src/os_common.h 8c61457df58f1a4bd5f5adc3e90e01b37bf7afbc
@@ -159,7 +159,7 @@ F src/select.c 607e5b2d3be379781e5be3ac0854f5c237152d26
 F src/shell.c 0a11f831603f17fea20ca97133c0f64e716af4a7
 F src/sqlite.h.in 0db1e59d89aeacb8fe64a19fd14c13a796060ccb
 F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17
-F src/sqliteInt.h 5ed5b45d9f23f2fa57c957cce76086552bcaa002
+F src/sqliteInt.h 7fe33227434a3e54e3056cbe95800bd09a636fbe
 F src/sqliteLimit.h ffe93f5a0c4e7bd13e70cd7bf84cfb5c3465f45d
 F src/status.c 237b193efae0cf6ac3f0817a208de6c6c6ef6d76
 F src/table.c 332ab0ea691e63862e2a8bdfe2c0617ee61062a3
@@ -173,9 +173,9 @@ F src/test6.c 1a0a7a1f179469044b065b4a88aab9faee114101
 F src/test7.c b94e68c2236de76889d82b8d7d8e00ad6a4d80b1
 F src/test8.c 3637439424d0d21ff2dcf9b015c30fcc1e7bcb24
 F src/test9.c 904ebe0ed1472d6bad17a81e2ecbfc20017dc237
-F src/test_async.c 65f8d6e4e325291fd2fbb08be0133f20a6beffed
+F src/test_async.c 3ff664df7d07b6cf65946161f494c47468ddc318
 F src/test_autoext.c f53b0cdf7bf5f08100009572a5d65cdb540bd0ad
-F src/test_backup.c 5b41518c5499dafe65177b0813b71ac356ee9df1
+F src/test_backup.c 79ac8daa03f0b3d360ff1eb56b23c7df0c14ecd1
 F src/test_btree.c d7b8716544611c323860370ee364e897c861f1b0
 F src/test_config.c a05378089b6773ba36b85727dedf9ec0a16424ce
 F src/test_devsym.c 9f4bc2551e267ce7aeda195f3897d0f30c5228f4
@@ -209,7 +209,7 @@ F src/vdbeblob.c e67757450ae8581a8b354d9d7e467e41502dfe38
 F src/vdbemem.c 38615b5d4b1b3b5a1221a5623578e5e3864e4888
 F src/vtab.c f1aba5a6dc1f83b97a39fbbc58ff8cbc76311347
 F src/walker.c 42bd3f00ca2ef5ae842304ec0d59903ef051412d
-F src/where.c 55b13048fd0f82b330511e37766208b96fd764df
+F src/where.c d0a78f876593b596c1e97286921cdc746e2f65ce
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/alias.test 597662c5d777a122f9a3df0047ea5c5bd383a911
 F test/all.test 14165b3e32715b700b5f0cbf8f6e3833dda0be45
@@ -709,7 +709,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P c32b454118f4b0cc615edb9b35f749db45f6b36d
-R ea5d8537489b6b8fc4a17cac56d52ded
-U danielk1977
-Z d6e541111169c7038ddb9311b1435d4a
+P de469c46f55bf772ab8a49a185dc1b87360a937f
+R e9469f23b57c90d143aea36786246fc4
+U drh
+Z 62842deb068b8a746d76749ba0cbd568
diff --git a/manifest.uuid b/manifest.uuid
index 27dd55e02..fda1ddd2e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-de469c46f55bf772ab8a49a185dc1b87360a937f
\ No newline at end of file
+8589b0fcc51a32188386e442655fd91f421ca7f8
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index 685b599f4..7b3db105d 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -12,7 +12,7 @@
 ** This file contains routines used for analyzing expressions and
 ** for generating VDBE code that evaluates expressions in SQLite.
 **
-** $Id: expr.c,v 1.423 2009/03/24 15:31:28 drh Exp $
+** $Id: expr.c,v 1.424 2009/03/25 16:51:43 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -659,7 +659,7 @@ void sqlite3ExprDelete(sqlite3 *db, Expr *p){
 ** The Expr.token field might be a string literal that is quoted.
 ** If so, remove the quotation marks.
 */
-void sqlite3DequoteExpr(sqlite3 *db, Expr *p){
+void sqlite3DequoteExpr(Expr *p){
   if( !ExprHasAnyProperty(p, EP_Dequoted) ){
     ExprSetProperty(p, EP_Dequoted);
     assert( (p->vvaFlags & EVVA_ReadOnlyToken)==0 );
@@ -1995,7 +1995,7 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){
       break;
     }
     case TK_STRING: {
-      sqlite3DequoteExpr(db, pExpr);
+      sqlite3DequoteExpr(pExpr);
       sqlite3VdbeAddOp4(v,OP_String8, 0, target, 0,
                         (char*)pExpr->token.z, pExpr->token.n);
       break;
@@ -2497,7 +2497,7 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){
          assert( pExpr->affinity==OE_Rollback ||
                  pExpr->affinity == OE_Abort ||
                  pExpr->affinity == OE_Fail );
-         sqlite3DequoteExpr(db, pExpr);
+         sqlite3DequoteExpr(pExpr);
          sqlite3VdbeAddOp4(v, OP_Halt, SQLITE_CONSTRAINT, pExpr->affinity, 0,
                         (char*)pExpr->token.z, pExpr->token.n);
       } else {
diff --git a/src/notify.c b/src/notify.c
index c4babbd70..27a8632db 100644
--- a/src/notify.c
+++ b/src/notify.c
@@ -13,7 +13,7 @@
 ** This file contains the implementation of the sqlite3_unlock_notify()
 ** API method and its associated functionality.
 **
-** $Id: notify.c,v 1.1 2009/03/16 13:19:36 danielk1977 Exp $
+** $Id: notify.c,v 1.2 2009/03/25 16:51:43 drh Exp $
 */
 #include "sqliteInt.h"
 #include "btreeInt.h"
@@ -230,9 +230,9 @@ void sqlite3ConnectionUnlocked(sqlite3 *db){
 
       sqlite3BeginBenignMalloc();
       assert( aArg==aDyn || (aDyn==0 && aArg==aStatic) );
-      assert( nArg<=ArraySize(aStatic) || aArg==aDyn );
-      if( (!aDyn && nArg==ArraySize(aStatic))
-       || (aDyn && nArg==(sqlite3DbMallocSize(db, aDyn)/sizeof(void*)))
+      assert( nArg<=(int)ArraySize(aStatic) || aArg==aDyn );
+      if( (!aDyn && nArg==(int)ArraySize(aStatic))
+       || (aDyn && nArg==(int)(sqlite3DbMallocSize(db, aDyn)/sizeof(void*)))
       ){
         /* The aArg[] array needs to grow. */
         void **pNew = (void **)sqlite3Malloc(nArg*sizeof(void *)*2);
@@ -307,4 +307,3 @@ void sqlite3ConnectionClosed(sqlite3 *db){
   leaveMutex();
 }
 #endif
-
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 781040bbd..46b87b7be 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.847 2009/03/24 15:31:28 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.848 2009/03/25 16:51:43 drh Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -2340,7 +2340,7 @@ void sqlite3SetString(char **, sqlite3*, const char*, ...);
 void sqlite3ErrorMsg(Parse*, const char*, ...);
 void sqlite3ErrorClear(Parse*);
 void sqlite3Dequote(char*);
-void sqlite3DequoteExpr(sqlite3*, Expr*);
+void sqlite3DequoteExpr(Expr*);
 int sqlite3KeywordCode(const unsigned char*, int);
 int sqlite3RunParser(Parse*, const char*, char **);
 void sqlite3FinishCoding(Parse*);
diff --git a/src/test_async.c b/src/test_async.c
index 689fb5a26..035f46543 100644
--- a/src/test_async.c
+++ b/src/test_async.c
@@ -10,7 +10,7 @@
 **
 *************************************************************************
 **
-** $Id: test_async.c,v 1.51 2009/03/25 14:24:42 drh Exp $
+** $Id: test_async.c,v 1.52 2009/03/25 16:51:43 drh Exp $
 **
 ** This file contains an example implementation of an asynchronous IO 
 ** backend for SQLite.
@@ -1308,11 +1308,11 @@ static void asyncDlError(sqlite3_vfs *pAsyncVfs, int nByte, char *zErrMsg){
   sqlite3_vfs *pVfs = (sqlite3_vfs *)pAsyncVfs->pAppData;
   pVfs->xDlError(pVfs, nByte, zErrMsg);
 }
-static void *asyncDlSym(
+static void (*asyncDlSym(
   sqlite3_vfs *pAsyncVfs, 
   void *pHandle, 
   const char *zSymbol
-){
+))(void){
   sqlite3_vfs *pVfs = (sqlite3_vfs *)pAsyncVfs->pAppData;
   return pVfs->xDlSym(pVfs, pHandle, zSymbol);
 }
diff --git a/src/test_backup.c b/src/test_backup.c
index 1a1418d1c..cee8049b6 100644
--- a/src/test_backup.c
+++ b/src/test_backup.c
@@ -10,7 +10,7 @@
 **
 *************************************************************************
 **
-** $Id: test_backup.c,v 1.1 2009/02/03 16:51:25 danielk1977 Exp $
+** $Id: test_backup.c,v 1.2 2009/03/25 16:51:43 drh Exp $
 */
 
 #include "tcl.h"
@@ -145,4 +145,3 @@ int Sqlitetestbackup_Init(Tcl_Interp *interp){
   Tcl_CreateObjCommand(interp, "sqlite3_backup", backupTestInit, 0, 0);
   return TCL_OK;
 }
-
diff --git a/src/where.c b/src/where.c
index 654549456..d3947edc8 100644
--- a/src/where.c
+++ b/src/where.c
@@ -16,7 +16,7 @@
 ** so is applicable.  Because this module is responsible for selecting
 ** indices, you might also think of this module as the "query optimizer".
 **
-** $Id: where.c,v 1.376 2009/03/22 20:36:19 drh Exp $
+** $Id: where.c,v 1.377 2009/03/25 16:51:43 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -656,7 +656,7 @@ static int isLikeOrGlob(
       (pColl->type!=SQLITE_COLL_NOCASE || !*pnoCase) ){
     return 0;
   }
-  sqlite3DequoteExpr(db, pRight);
+  sqlite3DequoteExpr(pRight);
   z = (char *)pRight->token.z;
   cnt = 0;
   if( z ){