From 5eff7cf0c9b040a195c5d53b8fb7f9a729394bc1 Mon Sep 17 00:00:00 2001 From: shane Date: Mon, 10 Aug 2009 03:57:58 +0000 Subject: [PATCH] Removed some warnings from the MSVC compile. (CVS 6965) FossilOrigin-Name: ee034cfc71425745dda8d5fee58ae95f937c86cd --- manifest | 18 +++++++++--------- manifest.uuid | 2 +- src/btree.c | 12 ++++++------ src/parse.y | 8 ++++---- src/sqliteInt.h | 6 +++--- src/trigger.c | 8 ++++---- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/manifest b/manifest index 501da41d83..265a571c42 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fixed\s"Interlocked"\slogic\serror\sthat\sprevented\sthe\s"static"\smutexes\sfrom\sbeing\sreleased\swhen\ssqlite3_shutdown()\sis\scalled.\sTicket\s#4011.\s(CVS\s6964) -D 2009-08-10T03:23:21 +C Removed\ssome\swarnings\sfrom\sthe\sMSVC\scompile.\s(CVS\s6965) +D 2009-08-10T03:57:58 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in df9359da7a726ccb67a45db905c5447d5c00c6ef F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -106,7 +106,7 @@ F src/auth.c 802a9439dfa0b8c208b10055cba400e82ef18025 F src/backup.c 6f1c2d9862c8a3feb7739dfcca02c1f5352e37f3 F src/bitvec.c e08f6c1a9551b88081fc737916c6c3fd5029a6cf F src/btmutex.c 0f43a75bb5b8147b386e8e1c3e71ba734e3863b7 -F src/btree.c 812c365f76ec4cf5965e1920f40505debc1ef4e9 +F src/btree.c 97d32ef9e00bd9d321fe1c53a3b6651928d8ea06 F src/btree.h 577448a890c2ab9b21e6ab74f073526184bceebe F src/btreeInt.h 1c86297e69380f6577e7ae67452597dd8d5c2705 F src/build.c a15de7c5d020a778b641fca0b2510126843f4b30 @@ -149,7 +149,7 @@ F src/os_unix.c cdb2a08b9ce4aa13b3f7b91d4dd60fb48be9f56a F src/os_win.c 79bb3c59d60bc6faadd379cf036c132fa545d7d6 F src/pager.c 4aa16cc8bc8e4b0b457fb3ddb600970381b2be7d F src/pager.h 11852d044c86cf5a9d6e34171fb0c4fcf1f6265f -F src/parse.y bcd46d43fbd23a22b8c020a3eb1806b794794ed5 +F src/parse.y 6c42631e72a3d14cde2bee85e79409066066d3df F src/pcache.c c92ffd4f3e1279b3766854c6d18b5bf4aac0d1fa F src/pcache.h 435ef324197f79391f9c92b71d7f92b548ad7a36 F src/pcache1.c 6dc833c89feac405dd8b4858232c97e679f182ec @@ -163,7 +163,7 @@ F src/select.c 67b0778c9585905c8aa75aaa469e76ef3c1d315a F src/shell.c db2643650b9268df89a4bedca3f1c6d9e786f1bb F src/sqlite.h.in eb42257503a48f6f12ff0b23a81067ba9b5ac1eb F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17 -F src/sqliteInt.h 2f8dae0ff826acddcaab941dabb96acbcbf84ecf +F src/sqliteInt.h 1840be421126be4e0027cc5b144bc82659ff781f F src/sqliteLimit.h ffe93f5a0c4e7bd13e70cd7bf84cfb5c3465f45d F src/status.c 237b193efae0cf6ac3f0817a208de6c6c6ef6d76 F src/table.c cc86ad3d6ad54df7c63a3e807b5783c90411a08d @@ -199,7 +199,7 @@ F src/test_tclvar.c 9e42fa59d3d2f064b7ab8628e7ab2dc8a9fe93d4 F src/test_thread.c b8a1ab7ca1a632f18e8a361880d5d65eeea08eac F src/test_wsd.c 3ae5101de6cbfda2720152ab659ea84079719241 F src/tokenize.c af8a56e6a50c5042fc305bfa796275e9bf26ff2b -F src/trigger.c f248851055abbb6fc583b1809b69a234a85a01b2 +F src/trigger.c 9bc5278d509d81ff0f9b52f0ce7239563d188e32 F src/update.c 4da327f706c0d0dfedf4d92154b1b5688bdea0ac F src/utf.c 9541d28f40441812c0b40f00334372a0542c00ff F src/util.c c2416f60ae704a8c4990e4909aa810f90cbffa07 @@ -741,7 +741,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746 -P 257e9b575029f63277ed602d1402f87cfa15d22e -R 7580883b146e79dce6cbe5347a4f71a2 +P 04cafb7ee3b67a68c0604d7f1143feaec44be610 +R 1419a22eb55c1ad98ad5f8d756f84cf9 U shane -Z 2db382aedef8e0c5b7864d5c95e06316 +Z 12e73935831a8b41af0afee706442c72 diff --git a/manifest.uuid b/manifest.uuid index de62a64294..05d18f9990 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -04cafb7ee3b67a68c0604d7f1143feaec44be610 \ No newline at end of file +ee034cfc71425745dda8d5fee58ae95f937c86cd \ No newline at end of file diff --git a/src/btree.c b/src/btree.c index 71a2f96dab..75ec937c35 100644 --- a/src/btree.c +++ b/src/btree.c @@ -9,7 +9,7 @@ ** May you share freely, never taking more than you give. ** ************************************************************************* -** $Id: btree.c,v 1.704 2009/08/08 18:01:08 drh Exp $ +** $Id: btree.c,v 1.705 2009/08/10 03:57:58 shane Exp $ ** ** This file implements a external (disk-based) database using BTrees. ** See the header comment on "btreeInt.h" for additional information. @@ -141,8 +141,8 @@ static int hasSharedCacheTableLock( HashElem *p; for(p=sqliteHashFirst(&pSchema->idxHash); p; p=sqliteHashNext(p)){ Index *pIdx = (Index *)sqliteHashData(p); - if( pIdx->tnum==iRoot ){ - iTab = pIdx->pTable->tnum; + if( pIdx->tnum==(int)iRoot ){ + iTab = pIdx->pTable->tnum; } } }else{ @@ -1371,7 +1371,7 @@ static int btreeInitPage(MemPage *pPage){ } testcase( pPage->nCell==MX_CELL(pBt) ); - /* A malformed database page might cause use to read past the end + /* A malformed database page might cause us to read past the end ** of page when parsing a cell. ** ** The following block of code checks early to see if a cell extends @@ -1432,7 +1432,7 @@ static int btreeInitPage(MemPage *pPage){ if( nFree>usableSize ){ return SQLITE_CORRUPT_BKPT; } - pPage->nFree = nFree - iCellFirst; + pPage->nFree = (u16)(nFree - iCellFirst); pPage->isInit = 1; } return SQLITE_OK; @@ -6236,7 +6236,7 @@ balance_cleanup: static int balance_deeper(MemPage *pRoot, MemPage **ppChild){ int rc; /* Return value from subprocedures */ MemPage *pChild = 0; /* Pointer to a new child page */ - Pgno pgnoChild; /* Page number of the new child page */ + Pgno pgnoChild = 0; /* Page number of the new child page */ BtShared *pBt = pRoot->pBt; /* The BTree */ assert( pRoot->nOverflow>0 ); diff --git a/src/parse.y b/src/parse.y index 04d7acae5b..39af6c0ce6 100644 --- a/src/parse.y +++ b/src/parse.y @@ -14,7 +14,7 @@ ** the parser. Lemon will also generate a header file containing ** numeric codes for all of the tokens. ** -** @(#) $Id: parse.y,v 1.285 2009/07/03 15:37:28 drh Exp $ +** @(#) $Id: parse.y,v 1.286 2009/08/10 03:57:58 shane Exp $ */ // All token codes are small integers with #defines that begin with "TK_" @@ -362,12 +362,12 @@ defer_subclause_opt(A) ::= defer_subclause(X). {A = X;} // default behavior when there is a constraint conflict. // %type onconf {int} -%type orconf {int} +%type orconf {u8} %type resolvetype {int} onconf(A) ::= . {A = OE_Default;} onconf(A) ::= ON CONFLICT resolvetype(X). {A = X;} orconf(A) ::= . {A = OE_Default;} -orconf(A) ::= OR resolvetype(X). {A = X;} +orconf(A) ::= OR resolvetype(X). {A = (u8)X;} resolvetype(A) ::= raisetype(X). {A = X;} resolvetype(A) ::= IGNORE. {A = OE_Ignore;} resolvetype(A) ::= REPLACE. {A = OE_Replace;} @@ -687,7 +687,7 @@ cmd ::= insert_cmd(R) INTO fullname(X) inscollist_opt(F) select(S). cmd ::= insert_cmd(R) INTO fullname(X) inscollist_opt(F) DEFAULT VALUES. {sqlite3Insert(pParse, X, 0, 0, F, R);} -%type insert_cmd {int} +%type insert_cmd {u8} insert_cmd(A) ::= INSERT orconf(R). {A = R;} insert_cmd(A) ::= REPLACE. {A = OE_Replace;} diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 8cd50157d9..19af9ce18d 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -11,7 +11,7 @@ ************************************************************************* ** Internal interface definitions for SQLite. ** -** @(#) $Id: sqliteInt.h,v 1.897 2009/08/06 17:43:31 drh Exp $ +** @(#) $Id: sqliteInt.h,v 1.898 2009/08/10 03:57:58 shane Exp $ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ @@ -2674,8 +2674,8 @@ void sqlite3MaterializeView(Parse*, Table*, Expr*, int); void sqlite3DeleteTriggerStep(sqlite3*, TriggerStep*); TriggerStep *sqlite3TriggerSelectStep(sqlite3*,Select*); TriggerStep *sqlite3TriggerInsertStep(sqlite3*,Token*, IdList*, - ExprList*,Select*,int); - TriggerStep *sqlite3TriggerUpdateStep(sqlite3*,Token*,ExprList*, Expr*, int); + ExprList*,Select*,u8); + TriggerStep *sqlite3TriggerUpdateStep(sqlite3*,Token*,ExprList*, Expr*, u8); TriggerStep *sqlite3TriggerDeleteStep(sqlite3*,Token*, Expr*); void sqlite3DeleteTrigger(sqlite3*, Trigger*); void sqlite3UnlinkAndDeleteTrigger(sqlite3*,int,const char*); diff --git a/src/trigger.c b/src/trigger.c index e7a4157d26..893ebcb30a 100644 --- a/src/trigger.c +++ b/src/trigger.c @@ -10,7 +10,7 @@ ************************************************************************* ** ** -** $Id: trigger.c,v 1.142 2009/08/06 17:43:31 drh Exp $ +** $Id: trigger.c,v 1.143 2009/08/10 03:57:58 shane Exp $ */ #include "sqliteInt.h" @@ -348,7 +348,7 @@ TriggerStep *sqlite3TriggerSelectStep(sqlite3 *db, Select *pSelect){ */ static TriggerStep *triggerStepAllocate( sqlite3 *db, /* Database connection */ - int op, /* Trigger opcode */ + u8 op, /* Trigger opcode */ Token *pName /* The target name */ ){ TriggerStep *pTriggerStep; @@ -377,7 +377,7 @@ TriggerStep *sqlite3TriggerInsertStep( IdList *pColumn, /* List of columns in pTableName to insert into */ ExprList *pEList, /* The VALUE clause: a list of values to be inserted */ Select *pSelect, /* A SELECT statement that supplies values */ - int orconf /* The conflict algorithm (OE_Abort, OE_Replace, etc.) */ + u8 orconf /* The conflict algorithm (OE_Abort, OE_Replace, etc.) */ ){ TriggerStep *pTriggerStep; @@ -409,7 +409,7 @@ TriggerStep *sqlite3TriggerUpdateStep( Token *pTableName, /* Name of the table to be updated */ ExprList *pEList, /* The SET clause: list of column and new values */ Expr *pWhere, /* The WHERE clause */ - int orconf /* The conflict algorithm. (OE_Abort, OE_Ignore, etc) */ + u8 orconf /* The conflict algorithm. (OE_Abort, OE_Ignore, etc) */ ){ TriggerStep *pTriggerStep;