diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/func.c | 4 | ||||
| -rw-r--r-- | src/main.c | 7 | ||||
| -rw-r--r-- | src/pager.c | 4 | ||||
| -rw-r--r-- | src/tclsqlite.c | 10 | ||||
| -rw-r--r-- | src/test1.c | 6 |
5 files changed, 17 insertions, 14 deletions
diff --git a/src/func.c b/src/func.c index 951365115..73ae8f6c7 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.125 2006/03/02 03:02:48 drh Exp $ +** $Id: func.c,v 1.126 2006/03/16 16:19:56 drh Exp $ */ #include "sqliteInt.h" #include <ctype.h> @@ -1079,7 +1079,7 @@ void sqlite3RegisterBuiltinFunctions(sqlite3 *db){ } sqlite3RegisterDateTimeFunctions(db); #ifdef SQLITE_SSE - sqlite3SseFunctions(db); + (void)sqlite3SseFunctions(db); #endif #ifdef SQLITE_CASE_SENSITIVE_LIKE sqlite3RegisterLikeFunctions(db, 1); diff --git a/src/main.c b/src/main.c index 44060403a..5f0b89bfd 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.338 2006/03/16 14:05:15 drh Exp $ +** $Id: main.c,v 1.339 2006/03/16 16:19:56 drh Exp $ */ #include "sqliteInt.h" #include "os.h" @@ -109,7 +109,10 @@ int sqlite3_close(sqlite3 *db){ } #ifdef SQLITE_SSE - sqlite3SseCleanup(db); + { + extern void sqlite3SseCleanup(sqlite3*); + sqlite3SseCleanup(db); + } #endif /* If there are any outstanding VMs, return SQLITE_BUSY. */ diff --git a/src/pager.c b/src/pager.c index 865dc9509..7e77048fe 100644 --- a/src/pager.c +++ b/src/pager.c @@ -18,7 +18,7 @@ ** file simultaneously, or one process from reading the database while ** another is writing. ** -** @(#) $Id: pager.c,v 1.262 2006/03/06 20:55:46 drh Exp $ +** @(#) $Id: pager.c,v 1.263 2006/03/16 16:19:56 drh Exp $ */ #ifndef SQLITE_OMIT_DISKIO #include "sqliteInt.h" @@ -3005,7 +3005,7 @@ int sqlite3pager_write(void *pData){ ** that we do not. */ assert( pPg->pgno!=PAGER_MJ_PGNO(pPager) ); pData2 = CODEC2(pPager, pData, pPg->pgno, 7); - cksum = pager_cksum(pPager, pData2); + cksum = pager_cksum(pPager, (u8*)pData2); pEnd = pData2 + pPager->pageSize; pData2 -= 4; saved = *(u32*)pEnd; diff --git a/src/tclsqlite.c b/src/tclsqlite.c index 1c077bd8d..cc9b8def0 100644 --- a/src/tclsqlite.c +++ b/src/tclsqlite.c @@ -11,7 +11,7 @@ ************************************************************************* ** A TCL Interface to SQLite ** -** $Id: tclsqlite.c,v 1.154 2006/03/06 23:30:52 drh Exp $ +** $Id: tclsqlite.c,v 1.155 2006/03/16 16:19:56 drh Exp $ */ #ifndef NO_TCL /* Omit this whole file if TCL is unavailable */ @@ -1088,7 +1088,7 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){ fclose(in); return TCL_ERROR; } - sqlite3_exec(pDb->db, "BEGIN", 0, 0, 0); + (void)sqlite3_exec(pDb->db, "BEGIN", 0, 0, 0); zCommit = "COMMIT"; while( (zLine = local_getline(0, in))!=0 ){ char *z; @@ -1136,7 +1136,7 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){ free(azCol); fclose(in); sqlite3_finalize(pStmt); - sqlite3_exec(pDb->db, zCommit, 0, 0, 0); + (void)sqlite3_exec(pDb->db, zCommit, 0, 0, 0); if( zCommit[0] == 'C' ){ /* success, set result as number of lines processed */ @@ -1847,7 +1847,7 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){ } inTrans = !sqlite3_get_autocommit(pDb->db); if( !inTrans ){ - sqlite3_exec(pDb->db, zBegin, 0, 0, 0); + (void)sqlite3_exec(pDb->db, zBegin, 0, 0, 0); } rc = Tcl_EvalObjEx(interp, pScript, 0); if( !inTrans ){ @@ -1857,7 +1857,7 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){ } else { zEnd = "COMMIT"; } - sqlite3_exec(pDb->db, zEnd, 0, 0, 0); + (void)sqlite3_exec(pDb->db, zEnd, 0, 0, 0); } break; } diff --git a/src/test1.c b/src/test1.c index 82a42ad70..ffcecc46b 100644 --- a/src/test1.c +++ b/src/test1.c @@ -13,7 +13,7 @@ ** is not included in the SQLite library. It is used for automated ** testing of the SQLite library. ** -** $Id: test1.c,v 1.207 2006/02/16 18:16:37 drh Exp $ +** $Id: test1.c,v 1.208 2006/03/16 16:19:56 drh Exp $ */ #include "sqliteInt.h" #include "tcl.h" @@ -488,7 +488,7 @@ static void sqlite3ExecFunc( ){ struct dstr x; memset(&x, 0, sizeof(x)); - sqlite3_exec((sqlite3*)sqlite3_user_data(context), + (void)sqlite3_exec((sqlite3*)sqlite3_user_data(context), (char*)sqlite3_value_text(argv[0]), execFuncCallback, &x, 0); sqlite3_result_text(context, x.z, x.nUsed, SQLITE_TRANSIENT); @@ -3008,7 +3008,7 @@ static int test_stack_used( } if( getDbPointer(interp, argv[1], &db) ) return TCL_ERROR; prepStack(); - sqlite3_exec(db, argv[2], 0, 0, 0); + (void)sqlite3_exec(db, argv[2], 0, 0, 0); for(i=65535; i>=0 && ((u32*)sqlite3_stack_baseline)[-i]==0xdeadbeef; i--){} Tcl_SetObjResult(interp, Tcl_NewIntObj(i*4)); return TCL_OK; |