Remove an unused parameter from sqlite3DequoteExpr. Fix another unrelated
and harmless compiler warning. (CVS 6386)
FossilOrigin-Name: 8589b0fcc51a32188386e442655fd91f421ca7f8
diff --git a/src/expr.c b/src/expr.c
index 685b599..7b3db10 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 @@
** 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 @@
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 @@
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 c4babbd..27a8632 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 @@
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 @@
leaveMutex();
}
#endif
-
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 781040b..46b87b7 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 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 689fb5a..035f465 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 @@
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 1a1418d..cee8049 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 @@
Tcl_CreateObjCommand(interp, "sqlite3_backup", backupTestInit, 0, 0);
return TCL_OK;
}
-
diff --git a/src/where.c b/src/where.c
index 6545494..d3947ed 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 @@
(pColl->type!=SQLITE_COLL_NOCASE || !*pnoCase) ){
return 0;
}
- sqlite3DequoteExpr(db, pRight);
+ sqlite3DequoteExpr(pRight);
z = (char *)pRight->token.z;
cnt = 0;
if( z ){