diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/build.c | 6 | ||||
| -rw-r--r-- | src/func.c | 5 | ||||
| -rw-r--r-- | src/main.c | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/src/build.c b/src/build.c index acf602fb1..300546f0e 100644 --- a/src/build.c +++ b/src/build.c @@ -22,7 +22,7 @@ ** COMMIT ** ROLLBACK ** -** $Id: build.c,v 1.513 2009/02/02 18:03:22 drh Exp $ +** $Id: build.c,v 1.514 2009/02/03 15:50:34 drh Exp $ */ #include "sqliteInt.h" @@ -1357,7 +1357,7 @@ static void identPut(char *z, int *pIdx, char *zSignedIdent){ ** table. Memory to hold the text of the statement is obtained ** from sqliteMalloc() and must be freed by the calling function. */ -static char *createTableStmt(sqlite3 *db, Table *p, int isTemp){ +static char *createTableStmt(sqlite3 *db, Table *p){ int i, k, n; char *zStmt; char *zSep, *zSep2, *zEnd, *z; @@ -1551,7 +1551,7 @@ void sqlite3EndTable( /* Compute the complete text of the CREATE statement */ if( pSelect ){ - zStmt = createTableStmt(db, p, p->pSchema==db->aDb[1].pSchema); + zStmt = createTableStmt(db, p); }else{ n = (int)(pEnd->z - pParse->sNameToken.z) + 1; zStmt = sqlite3MPrintf(db, diff --git a/src/func.c b/src/func.c index e5542b3b0..85af9e0e9 100644 --- a/src/func.c +++ b/src/func.c @@ -16,7 +16,7 @@ ** sqliteRegisterBuildinFunctions() found at the bottom of the file. ** All other code has file scope. ** -** $Id: func.c,v 1.220 2009/02/03 13:19:12 drh Exp $ +** $Id: func.c,v 1.221 2009/02/03 15:50:34 drh Exp $ */ #include "sqliteInt.h" #include <stdlib.h> @@ -287,6 +287,7 @@ static void upperFunc(sqlite3_context *context, int argc, sqlite3_value **argv){ char *z1; const char *z2; int i, n; + UNUSED_PARAMETER(argc); z2 = (char*)sqlite3_value_text(argv[0]); n = sqlite3_value_bytes(argv[0]); /* Verify that the call to _bytes() does not invalidate the _text() pointer */ @@ -306,6 +307,7 @@ static void lowerFunc(sqlite3_context *context, int argc, sqlite3_value **argv){ u8 *z1; const char *z2; int i, n; + UNUSED_PARAMETER(argc); z2 = (char*)sqlite3_value_text(argv[0]); n = sqlite3_value_bytes(argv[0]); /* Verify that the call to _bytes() does not invalidate the _text() pointer */ @@ -707,6 +709,7 @@ static const char hexdigits[] = { */ static void quoteFunc(sqlite3_context *context, int argc, sqlite3_value **argv){ assert( argc==1 ); + UNUSED_PARAMETER(argc); switch( sqlite3_value_type(argv[0]) ){ case SQLITE_INTEGER: case SQLITE_FLOAT: { diff --git a/src/main.c b/src/main.c index 11708fd41..f104e41ec 100644 --- a/src/main.c +++ b/src/main.c @@ -14,7 +14,7 @@ ** other files are for internal use by SQLite and should not be ** accessed by users of the library. ** -** $Id: main.c,v 1.523 2009/01/30 06:11:55 shane Exp $ +** $Id: main.c,v 1.524 2009/02/03 15:50:34 drh Exp $ */ #include "sqliteInt.h" @@ -396,7 +396,7 @@ static int setupLookaside(sqlite3 *db, void *pBuf, int sz, int cnt){ /* The size of a lookaside slot needs to be larger than a pointer ** to be useful. */ - if( sz<=sizeof(LookasideSlot*) ) sz = 0; + if( sz<=(int)sizeof(LookasideSlot*) ) sz = 0; if( cnt<0 ) cnt = 0; if( sz==0 || cnt==0 ){ sz = 0; |