From: drh Date: Wed, 24 Aug 2011 15:12:08 +0000 (+0000) Subject: Fix some harmless compiler warnings. X-Git-Tag: version-3.7.8~54 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88caeac774e0d35cfabee70f426db970aad49c3e;p=thirdparty%2Fsqlite.git Fix some harmless compiler warnings. FossilOrigin-Name: 46f5a68bfa4199a4bd398030bf88bfbb4df3d5ca --- diff --git a/main.mk b/main.mk index 6b65280b8e..4837d4e2fb 100644 --- a/main.mk +++ b/main.mk @@ -384,7 +384,7 @@ sqlite3.c: target_source $(TOP)/tool/mksqlite3c.tcl echo '#endif /* USE_SYSTEM_SQLITE */' >>tclsqlite3.c cat $(TOP)/src/tclsqlite.c >>tclsqlite3.c -sqlite3-debug.c: target_source $(TOP)/tool/mksqlite3c.tcl +sqlite3.c-debug: target_source $(TOP)/tool/mksqlite3c.tcl tclsh $(TOP)/tool/mksqlite3c.tcl --linemacros echo '#ifndef USE_SYSTEM_SQLITE' >tclsqlite3.c cat sqlite3.c >>tclsqlite3.c diff --git a/manifest b/manifest index 16af0d39ef..5a36cb7c61 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Changes\sto\stest_quota.c\sto\smake\squota\sgroups\spersistent\seven\safter\sfiles\nare\sclosed.\s\sFiles\sremain\sa\spart\sof\sthe\squota\sgroup\suntil\sthey\sare\ndeleted. -D 2011-08-24T01:25:55.043 +C Fix\ssome\sharmless\scompiler\swarnings. +D 2011-08-24T15:12:08.059 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 8c930e7b493d59099ea1304bd0f2aed152eb3315 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -104,7 +104,7 @@ F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8 -F main.mk 269e7bb626997b42a7d6989ec60451492d599ec7 +F main.mk 201b1d81aa4ac0af21b243151e79477c14ce3722 F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac @@ -127,7 +127,7 @@ F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7 F src/btree.c 97cf3ba4ff067e716753b33661035e50853aebba F src/btree.h f5d775cd6cfc7ac32a2535b70e8d2af48ef5f2ce F src/btreeInt.h 67978c014fa4f7cc874032dd3aacadd8db656bc3 -F src/build.c 6c60478a1e23f7cdd30ae0251b46f9adbe0e98c2 +F src/build.c 20784c6b4e4514c90aeeec2bee0fb9d79a4e2189 F src/callback.c 0425c6320730e6d3981acfb9202c1bed9016ad1a F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac F src/ctime.c caf51429be3e0d4114056a8273b0fff812ff8ae9 @@ -239,13 +239,13 @@ F src/utf.c c53eb7404b3eb5c1cbb5655c6a7a0e0ce6bd50f0 F src/util.c 06302ffd2b80408d4f6c7af71f7090e0cf8d8ff7 F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e F src/vdbe.c 22d0d5bc8e8e467e1e0fa20a0a6b21c297f5601f -F src/vdbe.h 5cf09e7ee8a3f7d93bc51f196a96550786afe7a1 +F src/vdbe.h 2bf6ec77d8b9980fc19da6e0b0a36d0dbf884ce4 F src/vdbeInt.h f9250326f264ca5f100acc19e9c07096bb889096 F src/vdbeapi.c 11dc47987abacb76ad016dcf5abc0dc422482a98 -F src/vdbeaux.c 8fb978eb73a97b34d352dd3ef3bff35b1b3fa7e9 +F src/vdbeaux.c 11b0df8822ecf61e543562247207df75e2ebb617 F src/vdbeblob.c f024f0bf420f36b070143c32b15cc7287341ffd3 F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b -F src/vdbesort.c a63bab05465ef7f8d28d46757eef55f84828d9a7 +F src/vdbesort.c d2c872322c94caae7abd39fe88eef177f66240cf F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114 F src/vtab.c 901791a47318c0562cd0c676a2c6ff1bc530e582 F src/wal.c 3154756177d6219e233d84291d5b05f4e06ff5e9 @@ -960,8 +960,8 @@ F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5 F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262 -P d5d835fe8352cb2009133246d4ed1cd310803f75 -R 2328973d91120b14c5ab36809b3bc4cb +F tool/warnings.sh b7fdb2cc525f5ef4fa43c80e771636dd3690f9d2 +P 04111ce980df9692b7fe65a36105e7de9627a3bb +R 28cff34240de2d39e36bc50cfecb7bd9 U drh -Z 9f91d97e63ce42debeb18d7ad0c4d84a +Z 9b59b931d9884ee79534f52b494533df diff --git a/manifest.uuid b/manifest.uuid index a8d9586f0b..1e28c0a8c2 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -04111ce980df9692b7fe65a36105e7de9627a3bb \ No newline at end of file +46f5a68bfa4199a4bd398030bf88bfbb4df3d5ca \ No newline at end of file diff --git a/src/build.c b/src/build.c index 8f387a028d..32c23855c1 100644 --- a/src/build.c +++ b/src/build.c @@ -1674,7 +1674,7 @@ void sqlite3CreateView( const char *z; Token sEnd; DbFixer sFix; - Token *pName; + Token *pName = 0; int iDb; sqlite3 *db = pParse->db; diff --git a/src/vdbe.h b/src/vdbe.h index e66ee3024d..fe758d2dbd 100644 --- a/src/vdbe.h +++ b/src/vdbe.h @@ -173,9 +173,9 @@ int sqlite3VdbeAddOp4(Vdbe*,int,int,int,int,const char *zP4,int); int sqlite3VdbeAddOp4Int(Vdbe*,int,int,int,int,int); int sqlite3VdbeAddOpList(Vdbe*, int nOp, VdbeOpList const *aOp); void sqlite3VdbeAddParseSchemaOp(Vdbe*,int,char*); -void sqlite3VdbeChangeP1(Vdbe*, int addr, int P1); -void sqlite3VdbeChangeP2(Vdbe*, int addr, int P2); -void sqlite3VdbeChangeP3(Vdbe*, int addr, int P3); +void sqlite3VdbeChangeP1(Vdbe*, u32 addr, int P1); +void sqlite3VdbeChangeP2(Vdbe*, u32 addr, int P2); +void sqlite3VdbeChangeP3(Vdbe*, u32 addr, int P3); void sqlite3VdbeChangeP5(Vdbe*, u8 P5); void sqlite3VdbeJumpHere(Vdbe*, int addr); void sqlite3VdbeChangeToNoop(Vdbe*, int addr, int N); diff --git a/src/vdbeaux.c b/src/vdbeaux.c index 95c65181e2..ffbb95ecac 100644 --- a/src/vdbeaux.c +++ b/src/vdbeaux.c @@ -524,10 +524,9 @@ int sqlite3VdbeAddOpList(Vdbe *p, int nOp, VdbeOpList const *aOp){ ** static array using sqlite3VdbeAddOpList but we want to make a ** few minor changes to the program. */ -void sqlite3VdbeChangeP1(Vdbe *p, int addr, int val){ +void sqlite3VdbeChangeP1(Vdbe *p, u32 addr, int val){ assert( p!=0 ); - assert( addr>=0 ); - if( p->nOp>addr ){ + if( ((u32)p->nOp)>addr ){ p->aOp[addr].p1 = val; } } @@ -536,10 +535,9 @@ void sqlite3VdbeChangeP1(Vdbe *p, int addr, int val){ ** Change the value of the P2 operand for a specific instruction. ** This routine is useful for setting a jump destination. */ -void sqlite3VdbeChangeP2(Vdbe *p, int addr, int val){ +void sqlite3VdbeChangeP2(Vdbe *p, u32 addr, int val){ assert( p!=0 ); - assert( addr>=0 ); - if( p->nOp>addr ){ + if( ((u32)p->nOp)>addr ){ p->aOp[addr].p2 = val; } } @@ -547,10 +545,9 @@ void sqlite3VdbeChangeP2(Vdbe *p, int addr, int val){ /* ** Change the value of the P3 operand for a specific instruction. */ -void sqlite3VdbeChangeP3(Vdbe *p, int addr, int val){ +void sqlite3VdbeChangeP3(Vdbe *p, u32 addr, int val){ assert( p!=0 ); - assert( addr>=0 ); - if( p->nOp>addr ){ + if( ((u32)p->nOp)>addr ){ p->aOp[addr].p3 = val; } } diff --git a/src/vdbesort.c b/src/vdbesort.c index a4dbab0be3..9e8d5cda07 100644 --- a/src/vdbesort.c +++ b/src/vdbesort.c @@ -626,12 +626,12 @@ int sqlite3VdbeSorterRewind(sqlite3 *db, VdbeCursor *pCsr, int *pbEof){ if( rc==SQLITE_OK ){ int bEof = 0; while( rc==SQLITE_OK && bEof==0 ){ - int nByte; + int nToWrite; VdbeSorterIter *pIter = &pSorter->aIter[ pSorter->aTree[1] ]; assert( pIter->pFile ); - nByte = pIter->nKey + sqlite3VarintLen(pIter->nKey); - rc = sqlite3OsWrite(pTemp2, pIter->aAlloc, nByte, iWrite2); - iWrite2 += nByte; + nToWrite = pIter->nKey + sqlite3VarintLen(pIter->nKey); + rc = sqlite3OsWrite(pTemp2, pIter->aAlloc, nToWrite, iWrite2); + iWrite2 += nToWrite; if( rc==SQLITE_OK ){ rc = sqlite3VdbeSorterNext(db, pCsr, &bEof); } diff --git a/tool/warnings.sh b/tool/warnings.sh index 2eb3992f09..dcba820d0e 100644 --- a/tool/warnings.sh +++ b/tool/warnings.sh @@ -3,7 +3,8 @@ # Run this script in a directory with a working makefile to check for # compiler warnings in SQLite. # -make sqlite3.c +rm -f sqlite3.c +make sqlite3.c-debug echo '********** No optimizations. Includes FTS4 and RTREE *********' gcc -c -Wshadow -Wall -Wextra -pedantic-errors -Wno-long-long -std=c89 \ -ansi -DHAVE_STDINT_H -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_RTREE \