From: drh Date: Tue, 3 Feb 2009 15:50:33 +0000 (+0000) Subject: Remove several compiler warnings. (CVS 6239) X-Git-Tag: version-3.6.15~511 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d34fdecb6dbfb042d191a06925e50faefc7e049;p=thirdparty%2Fsqlite.git Remove several compiler warnings. (CVS 6239) FossilOrigin-Name: 85e9196d79ef8500300abb215a31e0519b2e8d02 --- diff --git a/manifest b/manifest index 88a8bfb7b2..0515c952fa 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Remove\sthe\stext\sof\sthe\ssqlite3VdbeMemSanity()\sroutine,\swhich\swas\salready\ncommented\sout.\s(CVS\s6238) -D 2009-02-03T15:39:01 +C Remove\sseveral\scompiler\swarnings.\s(CVS\s6239) +D 2009-02-03T15:50:34 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 3871d308188cefcb7c5ab20da4c7b6aad023bc52 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -106,14 +106,14 @@ F src/btmutex.c 63c5cc4ad5715690767ffcb741e185d7bc35ec1a F src/btree.c dfbbfc396fdd8cbc29754864a97c4df484b78870 F src/btree.h 07359623fa24748709dd61212a32364a6adc6b56 F src/btreeInt.h 44bcbfe387ba99a3a9f2527bd12fa1bb8bc574b3 -F src/build.c 691354249a4a56ff09e370a13092e70ac1160f3c +F src/build.c 1d755e4920d94b7b470f47d1915b131b92fe6f6b F src/callback.c 5f10bca853e59a2c272bbfd5b720303f8b69e520 F src/complete.c cb14e06dbe79dee031031f0d9e686ff306afe07c F src/date.c 870770dde3fb56772ab247dfb6a6eda44d16cfbc F src/delete.c 6249005bdd8f85db6ec5f31ddb5c07de023693cc F src/expr.c 76dc3dc83b56ab8db50a772714fac49def8bbf12 F src/fault.c dc88c821842157460750d2d61a8a8b4197d047ff -F src/func.c ccc2bc683ed1b092beafdb374413482fcc9e62d3 +F src/func.c ec95417daf260fe574d8a6500946db30e88242ed F src/global.c ab003581ea4ff193cfe17a00e1303bc51db619a5 F src/hash.c 5824e6ff7ba78cd34c8d6cd724367713583e5b55 F src/hash.h 28f38ebb1006a5beedcb013bcdfe31befe7437ae @@ -122,7 +122,7 @@ F src/insert.c f6db1e6f43aae337e64a755208abb6ff124edc19 F src/journal.c e00df0c0da8413ab6e1bb7d7cab5665d4a9000d0 F src/legacy.c 8b3b95d48d202614946d7ce7256e7ba898905c3b F src/loadext.c 3f96631089fc4f3871a67f02f2e4fc7ea4d51edc -F src/main.c d4d52cf35438c15c3f1b4607b7cd32a7b90bc37a +F src/main.c a7d7fd7df4e9f8fa3418258619436c969234fd82 F src/malloc.c bc408056b126db37b6fba00e170d578cc67be6b3 F src/mem0.c f2f84062d1f35814d6535c9f9e33de3bfb3b132c F src/mem1.c 3bfb39e4f60b0179713a7c087b2d4f0dc205735f @@ -695,7 +695,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e -P b054b569172c53f4e185e4a64f41d08784aa0f8b -R 457b1a0aeb8d87e7c5afc57610b99229 +P a3c260772bda68007b73feee6612495a704c84f5 +R 4be53e85f4eb56c390ea2bfdacd4afab U drh -Z 4acf5301e63e1e219eaefae473c300d6 +Z d2b8ff82a6936c4ddba64fc501a7998e diff --git a/manifest.uuid b/manifest.uuid index 06ea667d87..3c341294b6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -a3c260772bda68007b73feee6612495a704c84f5 \ No newline at end of file +85e9196d79ef8500300abb215a31e0519b2e8d02 \ No newline at end of file diff --git a/src/build.c b/src/build.c index acf602fb18..300546f0ef 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 e5542b3b08..85af9e0e95 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 @@ -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 11708fd41d..f104e41ec1 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;