diff --git a/manifest b/manifest index 14fa527626..6d85d28140 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Trivial\smodifications\sto\sprevent\scompiler\swarnings.\s(CVS\s1606) -D 2004-06-16T12:00:29 +C Trivial\smodifications\sto\sprevent\scompiler\swarnings.\s(CVS\s1607) +D 2004-06-16T12:02:43 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd @@ -51,10 +51,10 @@ F src/os_win.h 004eec47b1780fcaf07420ddc2072294b698d48c F src/pager.c 453099416c10669365ca70f12f13e67e6ef11000 F src/pager.h bc58d32a9dee464f7268fb68652c130a4216e438 F src/parse.y 097438674976355a10cf177bd97326c548820b86 -F src/pragma.c be8ed53611971f8c93f66cd31129af89e6d58997 -F src/printf.c 060199ba9768c9d146f8897d33d250e6ff2adaef +F src/pragma.c b51bd2034a54f62a72ad454028712afaa294ff94 +F src/printf.c 7e7f83a747bbd0601dcb4ee2885fb3ce3e994a9f F src/random.c eff68e3f257e05e81eae6c4d50a51eb88beb4ff3 -F src/select.c 7036757825668f28e446fea3fc97775f16667f35 +F src/select.c ee37ea91bea336e9cb3356e0790d3e8787b6ba13 F src/shell.c ca519519dcbbc582f6d88f7d0e7583b857fd3469 F src/sqlite.h.in 36c253844656186ca53e1999efa6ef7b44f88779 F src/sqliteInt.h 924f0bcb493722c90cec7b19a240a37a4f01bbe7 @@ -66,8 +66,8 @@ F src/test3.c beafd0ccf7b9ae784744be1b1e66ffe8f64c25da F src/test4.c a921a69821fd30209589228e64f94e9f715b6fe2 F src/test5.c 13ac1db35b03acbc197ceb245fe862da5ebf2369 F src/tokenize.c 183c5d7da11affab5d70d903d33409c8c0ce6c5b -F src/trigger.c 9b08b80da4f98434babaa48b215a4af29059dc1e -F src/update.c 6133c876aa126e1771cda165fd992bb0d2f8eb38 +F src/trigger.c 3325207ea41d2d429e70370ce2ff987fd49b7ada +F src/update.c f9a03233577e0c3d57234d1957963875fc941da2 F src/utf.c e16737b3fc4201bf7ce9bd8ced5250596aa31b76 F src/util.c 6e93dad9a17b34f37fc270ba871b224240168bf0 F src/vacuum.c f9561c8095407a970af4e6a304b77c4083433d3e @@ -224,7 +224,7 @@ F www/support.tcl 1801397edd271cc39a2aadd54e701184b5181248 F www/tclsqlite.tcl 19191cf2a1010eaeff74c51d83fd5f5a4d899075 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4 -P b739ef2a1b8f7cfee4ab3f4c1319c159bd1e2e40 -R 34de51c2b09ded7c20407703316e67d9 +P 6001c5e1ced08096bb404e72ff533b7edcc896ec +R 926ee1c1181221a8e533445e06805bda U danielk1977 -Z 65f56c8d01087ad1b77a565b9ecae0bf +Z 8d48f23f609d3721dcaa35ec5bb8ceaf diff --git a/manifest.uuid b/manifest.uuid index 09c714014f..fb18517711 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6001c5e1ced08096bb404e72ff533b7edcc896ec \ No newline at end of file +7974c9a6f5ed86f02176376d99d909c43a4ae455 \ No newline at end of file diff --git a/src/pragma.c b/src/pragma.c index 3dcd2beaba..8a9dabd594 100644 --- a/src/pragma.c +++ b/src/pragma.c @@ -11,7 +11,7 @@ ************************************************************************* ** This file contains code used to implement the PRAGMA command. ** -** $Id: pragma.c,v 1.44 2004/06/15 16:51:01 danielk1977 Exp $ +** $Id: pragma.c,v 1.45 2004/06/16 12:02:43 danielk1977 Exp $ */ #include "sqliteInt.h" #include @@ -454,20 +454,20 @@ void sqlite3Pragma(Parse *pParse, Token *pLeft, Token *pRight, int minusFlag){ if( pTab ){ v = sqlite3GetVdbe(pParse); pIdx = pTab->pIndex; - } - if( pTab && pIdx ){ - int i = 0; - sqlite3VdbeSetNumCols(v, 3); - sqlite3VdbeSetColName(v, 0, "seq", P3_STATIC); - sqlite3VdbeSetColName(v, 1, "name", P3_STATIC); - sqlite3VdbeSetColName(v, 2, "unique", P3_STATIC); - while(pIdx){ - sqlite3VdbeAddOp(v, OP_Integer, i, 0); - sqlite3VdbeOp3(v, OP_String8, 0, 0, pIdx->zName, 0); - sqlite3VdbeAddOp(v, OP_Integer, pIdx->onError!=OE_None, 0); - sqlite3VdbeAddOp(v, OP_Callback, 3, 0); - ++i; - pIdx = pIdx->pNext; + if( pIdx ){ + int i = 0; + sqlite3VdbeSetNumCols(v, 3); + sqlite3VdbeSetColName(v, 0, "seq", P3_STATIC); + sqlite3VdbeSetColName(v, 1, "name", P3_STATIC); + sqlite3VdbeSetColName(v, 2, "unique", P3_STATIC); + while(pIdx){ + sqlite3VdbeAddOp(v, OP_Integer, i, 0); + sqlite3VdbeOp3(v, OP_String8, 0, 0, pIdx->zName, 0); + sqlite3VdbeAddOp(v, OP_Integer, pIdx->onError!=OE_None, 0); + sqlite3VdbeAddOp(v, OP_Callback, 3, 0); + ++i; + pIdx = pIdx->pNext; + } } } }else @@ -483,28 +483,28 @@ void sqlite3Pragma(Parse *pParse, Token *pLeft, Token *pRight, int minusFlag){ if( pTab ){ v = sqlite3GetVdbe(pParse); pFK = pTab->pFKey; - } - if( pTab && pFK ){ - int i = 0; - sqlite3VdbeSetNumCols(v, 5); - sqlite3VdbeSetColName(v, 0, "id", P3_STATIC); - sqlite3VdbeSetColName(v, 1, "seq", P3_STATIC); - sqlite3VdbeSetColName(v, 2, "table", P3_STATIC); - sqlite3VdbeSetColName(v, 3, "from", P3_STATIC); - sqlite3VdbeSetColName(v, 4, "to", P3_STATIC); - while(pFK){ - int j; - for(j=0; jnCol; j++){ - sqlite3VdbeAddOp(v, OP_Integer, i, 0); - sqlite3VdbeAddOp(v, OP_Integer, j, 0); - sqlite3VdbeOp3(v, OP_String8, 0, 0, pFK->zTo, 0); - sqlite3VdbeOp3(v, OP_String8, 0, 0, - pTab->aCol[pFK->aCol[j].iFrom].zName, 0); - sqlite3VdbeOp3(v, OP_String8, 0, 0, pFK->aCol[j].zCol, 0); - sqlite3VdbeAddOp(v, OP_Callback, 5, 0); + if( pFK ){ + int i = 0; + sqlite3VdbeSetNumCols(v, 5); + sqlite3VdbeSetColName(v, 0, "id", P3_STATIC); + sqlite3VdbeSetColName(v, 1, "seq", P3_STATIC); + sqlite3VdbeSetColName(v, 2, "table", P3_STATIC); + sqlite3VdbeSetColName(v, 3, "from", P3_STATIC); + sqlite3VdbeSetColName(v, 4, "to", P3_STATIC); + while(pFK){ + int j; + for(j=0; jnCol; j++){ + sqlite3VdbeAddOp(v, OP_Integer, i, 0); + sqlite3VdbeAddOp(v, OP_Integer, j, 0); + sqlite3VdbeOp3(v, OP_String8, 0, 0, pFK->zTo, 0); + sqlite3VdbeOp3(v, OP_String8, 0, 0, + pTab->aCol[pFK->aCol[j].iFrom].zName, 0); + sqlite3VdbeOp3(v, OP_String8, 0, 0, pFK->aCol[j].zCol, 0); + sqlite3VdbeAddOp(v, OP_Callback, 5, 0); + } + ++i; + pFK = pFK->pNextFrom; } - ++i; - pFK = pFK->pNextFrom; } } }else diff --git a/src/printf.c b/src/printf.c index 93eefef242..13d4e116f3 100644 --- a/src/printf.c +++ b/src/printf.c @@ -825,22 +825,6 @@ void sqlite3DebugPrintf(const char *zFormat, ...){ ** ** These routines are all just simple wrappers. */ -int sqlite3_exec_printf( - sqlite *db, /* An open database */ - const char *sqlFormat, /* printf-style format string for the SQL */ - sqlite_callback xCallback, /* Callback function */ - void *pArg, /* 1st argument to callback function */ - char **errmsg, /* Error msg written here */ - ... /* Arguments to the format string. */ -){ - va_list ap; - int rc; - - va_start(ap, errmsg); - rc = sqlite3_exec_vprintf(db, sqlFormat, xCallback, pArg, errmsg, ap); - va_end(ap); - return rc; -} int sqlite3_exec_vprintf( sqlite *db, /* An open database */ const char *sqlFormat, /* printf-style format string for the SQL */ @@ -857,20 +841,19 @@ int sqlite3_exec_vprintf( free(zSql); return rc; } -int sqlite3_get_table_printf( - sqlite *db, /* An open database */ - const char *sqlFormat, /* printf-style format string for the SQL */ - char ***resultp, /* Result written to a char *[] that this points to */ - int *nrow, /* Number of result rows written here */ - int *ncol, /* Number of result columns written here */ - char **errmsg, /* Error msg written here */ - ... /* Arguments to the format string */ +int sqlite3_exec_printf( + sqlite *db, /* An open database */ + const char *sqlFormat, /* printf-style format string for the SQL */ + sqlite_callback xCallback, /* Callback function */ + void *pArg, /* 1st argument to callback function */ + char **errmsg, /* Error msg written here */ + ... /* Arguments to the format string. */ ){ va_list ap; int rc; va_start(ap, errmsg); - rc = sqlite3_get_table_vprintf(db, sqlFormat, resultp, nrow, ncol, errmsg, ap); + rc = sqlite3_exec_vprintf(db, sqlFormat, xCallback, pArg, errmsg, ap); va_end(ap); return rc; } @@ -891,3 +874,20 @@ int sqlite3_get_table_vprintf( free(zSql); return rc; } +int sqlite3_get_table_printf( + sqlite *db, /* An open database */ + const char *sqlFormat, /* printf-style format string for the SQL */ + char ***resultp, /* Result written to a char *[] that this points to */ + int *nrow, /* Number of result rows written here */ + int *ncol, /* Number of result columns written here */ + char **errmsg, /* Error msg written here */ + ... /* Arguments to the format string */ +){ + va_list ap; + int rc; + + va_start(ap, errmsg); + rc = sqlite3_get_table_vprintf(db, sqlFormat, resultp, nrow, ncol, errmsg, ap); + va_end(ap); + return rc; +} diff --git a/src/select.c b/src/select.c index d723f3e42f..9c601423c3 100644 --- a/src/select.c +++ b/src/select.c @@ -12,7 +12,7 @@ ** This file contains C code routines that are called by the parser ** to handle SELECT statements in SQLite. ** -** $Id: select.c,v 1.190 2004/06/15 02:44:19 danielk1977 Exp $ +** $Id: select.c,v 1.191 2004/06/16 12:02:47 danielk1977 Exp $ */ #include "sqliteInt.h" @@ -1404,7 +1404,7 @@ static int multiSelect( case TK_EXCEPT: case TK_UNION: { int unionTab; /* Cursor number of the temporary table holding result */ - int op; /* One of the SRT_ operations to apply to self */ + int op = 0; /* One of the SRT_ operations to apply to self */ int priorOp; /* The SRT_ operation to apply to prior selects */ int nLimit, nOffset; /* Saved values of p->nLimit and p->nOffset */ ExprList *pOrderBy; /* The ORDER BY clause for the right SELECT */ @@ -2342,7 +2342,7 @@ int sqlite3Select( /* Generate code for all sub-queries in the FROM clause */ for(i=0; inSrc; i++){ - const char *zSavedAuthContext; + const char *zSavedAuthContext = 0; int needRestoreContext; if( pTabList->a[i].pSelect==0 ) continue; diff --git a/src/trigger.c b/src/trigger.c index 56c17c1e91..a1b3979381 100644 --- a/src/trigger.c +++ b/src/trigger.c @@ -417,7 +417,7 @@ void sqlite3DeleteTrigger(Trigger *pTrigger){ * if the transaction is rolled back. */ void sqlite3DropTrigger(Parse *pParse, SrcList *pName){ - Trigger *pTrigger; + Trigger *pTrigger = 0; int i; const char *zDb; const char *zName; diff --git a/src/update.c b/src/update.c index 56165991cd..eae9dab4db 100644 --- a/src/update.c +++ b/src/update.c @@ -12,7 +12,7 @@ ** This file contains C code routines that are called by the parser ** to handle UPDATE statements. ** -** $Id: update.c,v 1.83 2004/06/13 00:54:02 drh Exp $ +** $Id: update.c,v 1.84 2004/06/16 12:02:52 danielk1977 Exp $ */ #include "sqliteInt.h" @@ -32,7 +32,7 @@ void sqlite3Update( ){ int i, j; /* Loop counters */ Table *pTab; /* The table to be updated */ - int addr; /* VDBE instruction address of the start of the loop */ + int addr = 0; /* VDBE instruction address of the start of the loop */ WhereInfo *pWInfo; /* Information about the WHERE clause */ Vdbe *v; /* The virtual database engine */ Index *pIdx; /* For looping over indices */ @@ -46,8 +46,8 @@ void sqlite3Update( ** an expression for the i-th column of the table. ** aXRef[i]==-1 if the i-th column is not changed. */ int chngRecno; /* True if the record number is being changed */ - Expr *pRecnoExpr; /* Expression defining the new record number */ - int openAll; /* True if all indices need to be opened */ + Expr *pRecnoExpr = 0; /* Expression defining the new record number */ + int openAll = 0; /* True if all indices need to be opened */ int isView; /* Trying to update a view */ AuthContext sContext; /* The authorization context */