From 87cc3b3180cbe0ce4c677dde18d30d7fb149e412 Mon Sep 17 00:00:00 2001 From: drh Date: Tue, 8 May 2007 21:45:27 +0000 Subject: [PATCH] Remove compiler warnings in the amalgamation. (CVS 3960) FossilOrigin-Name: c5754530c6b1a8151c558f33d27fed70c95a988b --- manifest | 28 ++++++++++++++-------------- manifest.uuid | 2 +- src/btree.c | 20 +++----------------- src/btree.h | 8 +------- src/os.c | 21 ++++++++++----------- src/os.h | 7 +++++-- src/pager.c | 8 +++++--- src/pager.h | 30 ++++++++++++++++++------------ src/sqliteInt.h | 25 ++++++++----------------- src/vdbe.h | 7 ++++--- src/vdbeInt.h | 12 ++++++------ 11 files changed, 75 insertions(+), 93 deletions(-) diff --git a/manifest b/manifest index 7e10a13c49..435e201a3e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Disable\stracing\spragmas\swhen\snot\sin\sdebug\smode.\s\sThis\seliminates\san\sexternal\ndependency\son\sstdout.\s(CVS\s3959) -D 2007-05-08T20:59:49 +C Remove\scompiler\swarnings\sin\sthe\samalgamation.\s(CVS\s3960) +D 2007-05-08T21:45:27 F Makefile.in 87b200ad9970907f76df734d29dff3d294c10935 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -61,8 +61,8 @@ F src/alter.c ca8fc4a3c7359379598dc12589b65c32eb88defd F src/analyze.c 4bbf5ddf9680587c6d4917e02e378b6037be3651 F src/attach.c a674f72b5e4a02b81d0ae7e6e14c1a2f48e36491 F src/auth.c 902f4722661c796b97f007d9606bd7529c02597f -F src/btree.c dca996d45f1b8a87c86d0ec22a7ef6ca8c1ab805 -F src/btree.h 8444af0c82c0e878b5ce8a6eb345904830e678a5 +F src/btree.c ec0943dd89a7209ea3326ff29df7708f98c5596f +F src/btree.h 1d527bf61ed176f980c34999d5793a0fd45dcf8c F src/btreeInt.h cb3c0e9eb842d06079a62cdf3492c90c5db7ba75 F src/build.c 5789303291d40a1d37bfede83c1c769be22c88ab F src/callback.c 9c12535669a638f90a67e10440b99c7b93c0fbf4 @@ -81,8 +81,8 @@ F src/loadext.c afe4f4755dc49c36ef505748bbdddecb9f1d02a2 F src/main.c 797dc983716c1480f6af78a36be3add8806211a1 F src/malloc.c b89e31258a85158d15795bf87ae3ba007e56329b F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217 -F src/os.c 4650e98aadd27abfe1698ff58edf6893c58d4881 -F src/os.h 9240adf088fd55732f8926f9017601ba3430ead8 +F src/os.c 1f10b47acc1177fb9225edb4f5f0d25ed716f9cb +F src/os.h 213dd1f8f7ab9159c04a893eadc0cdd52515df16 F src/os_common.h a38233cd3b1f260db6f01f1093295d5708130065 F src/os_os2.c 2ce97909b926a598823f97338027dbec1dcf4165 F src/os_os2.h e5f17dd69333632bbc3112881ea407c37d245eb3 @@ -92,8 +92,8 @@ F src/os_unix.c cb1fb044b84870c7b1b8b2902e9d7be779f8b7ce F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e F src/os_win.c 3b6169038101d06c54b4f04662bfd44b6cf2f289 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b -F src/pager.c c5b32e741fb73930b6ec3d886ea680a3de3be5f7 -F src/pager.h db31691786504625e7e25c8cde4f40779ba209d9 +F src/pager.c 8799ca4265f3c24f5ef0f7a18290caeb6f23633c +F src/pager.h 94110a5570dca30d54a883e880a3633b2e4c05ae F src/parse.y fe7efcbf0ef1727cb2c08c1a10869b4ac9d5e71d F src/pragma.c 0703152b9edd6601eea95e1d474b3bc2962d7920 F src/prepare.c 87c23644986b5e41a58bc76f05abebd899e00089 @@ -104,7 +104,7 @@ F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96 F src/shell.c d07ae326b3815d80f71c69b3c7584382e47f6447 F src/sqlite.h.in 664b8702c27dc742584788823c548491ac8935d6 F src/sqlite3ext.h 7d0d363ea7327e817ef0dfe1b7eee1f171b72890 -F src/sqliteInt.h da5ded9e98e319e7b159d1863440e47dca2761e7 +F src/sqliteInt.h 2a4ec9eb67f7d1c634a5bfad9915549f9d3ac919 F src/table.c a8de75bcedf84d4060d804264b067ab3b1a3561d F src/tclsqlite.c f425c7583665ef78dd8397b2de0b8e0028e80ce2 F src/test1.c 16938b7e76469abf957745743dd0287d5dee476d @@ -133,8 +133,8 @@ F src/utf.c 168fe53589e2d0faec053af098c0d02e6a7690a8 F src/util.c 4f6bbcec2b2b1884d652b82c9f8949ede4618d68 F src/vacuum.c 8bd895d29e7074e78d4e80f948e35ddc9cf2beef F src/vdbe.c a24290221c20a2c5436f79bc52a9271457138416 -F src/vdbe.h a6c910b7361c927bd516d5a76de9278fe6703ce7 -F src/vdbeInt.h 095222fefd7343893cb7e2da7473590b58fb0aad +F src/vdbe.h 001c5b257567c1d3de7feb2203aac71d0d7b16a3 +F src/vdbeInt.h bddb7931fc1216fda6f6720e18d2a9b1e0f8fc96 F src/vdbeapi.c 120e04492e98e3cfd5545dd7130c76987e40e8b3 F src/vdbeaux.c 62011e2ccf5fa9b3dcc7fa6ff5f0e0638d324a70 F src/vdbeblob.c 96f3572fdc45eda5be06e6372b612bc30742d9f0 @@ -486,7 +486,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5 -P e9f56ead0514f3eac75807ea710c1f035b8add4f -R fee0a386491a138dc132cc38920c0e49 +P 5a0fe9854849bf3f04008a5dbb7a74e7d0d815ca +R 514aafdea0c68aae06a8c21333d9a874 U drh -Z 5fc9ecc351f15a6ac4eae3d9e044c2d3 +Z 3e5e3cb17c97a7cf9ceda09dec5ad25f diff --git a/manifest.uuid b/manifest.uuid index 3be04e8a80..f6ab97a616 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5a0fe9854849bf3f04008a5dbb7a74e7d0d815ca \ No newline at end of file +c5754530c6b1a8151c558f33d27fed70c95a988b \ No newline at end of file diff --git a/src/btree.c b/src/btree.c index 13278a1ca8..90ee29ca5e 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.378 2007/05/08 14:51:37 drh Exp $ +** $Id: btree.c,v 1.379 2007/05/08 21:45:27 drh Exp $ ** ** This file implements a external (disk-based) database using BTrees. ** See the header comment on "btreeInt.h" for additional information. @@ -2409,20 +2409,6 @@ create_cursor_exception: return rc; } -#if 0 /* Not Used */ -/* -** Change the value of the comparison function used by a cursor. -*/ -void sqlite3BtreeSetCompare( - BtCursor *pCur, /* The cursor to whose comparison function is changed */ - int(*xCmp)(void*,int,const void*,int,const void*), /* New comparison func */ - void *pArg /* First argument to xCmp() */ -){ - pCur->xCompare = xCmp ? xCmp : dfltCompare; - pCur->pArg = pArg; -} -#endif - /* ** Close a cursor. The read lock on the database file is released ** when the last cursor is closed. @@ -6262,7 +6248,6 @@ int sqlite3BtreeLockTable(Btree *p, int iTab, u8 isWriteLock){ ** to change the length of the data stored. */ int sqlite3BtreePutData(BtCursor *pCsr, u32 offset, u32 amt, void *z){ - BtShared *pBt = pCsr->pBtree->pBt; assert(pCsr->isIncrblobHandle); if( pCsr->eState==CURSOR_REQUIRESEEK ){ @@ -6277,7 +6262,8 @@ int sqlite3BtreePutData(BtCursor *pCsr, u32 offset, u32 amt, void *z){ if( !pCsr->wrFlag ){ return SQLITE_READONLY; } - assert( !pBt->readOnly && pBt->inTransaction==TRANS_WRITE ); + assert( !pCsr->pBtree->pBt->readOnly + && pCsr->pBtree->pBt->inTransaction==TRANS_WRITE ); if( checkReadLocks(pCsr->pBtree, pCsr->pgnoRoot, pCsr) ){ return SQLITE_LOCKED; /* The table pCur points to has a read lock */ } diff --git a/src/btree.h b/src/btree.h index 942ee94e0b..bf8929d4f6 100644 --- a/src/btree.h +++ b/src/btree.h @@ -13,7 +13,7 @@ ** subsystem. See comments in the source code for a detailed description ** of what each interface routine does. ** -** @(#) $Id: btree.h,v 1.81 2007/05/08 14:51:37 drh Exp $ +** @(#) $Id: btree.h,v 1.82 2007/05/08 21:45:27 drh Exp $ */ #ifndef _BTREE_H_ #define _BTREE_H_ @@ -115,12 +115,6 @@ int sqlite3BtreeCursor( BtCursor **ppCursor /* Returned cursor */ ); -void sqlite3BtreeSetCompare( - BtCursor *, - int(*)(void*,int,const void*,int,const void*), - void* -); - int sqlite3BtreeCloseCursor(BtCursor*); int sqlite3BtreeMoveto(BtCursor*,const void *pKey,i64 nKey,int bias,int *pRes); int sqlite3BtreeDelete(BtCursor*); diff --git a/src/os.c b/src/os.c index bc65ae32b2..7cd1ab99dd 100644 --- a/src/os.c +++ b/src/os.c @@ -53,14 +53,6 @@ int sqlite3OsSync(OsFile *id, int fullsync){ void sqlite3OsSetFullSync(OsFile *id, int value){ id->pMethod->xSetFullSync(id, value); } -#if defined(SQLITE_TEST) || defined(SQLITE_DEBUG) -/* This method is currently only used while interactively debugging the -** pager. More specificly, it can only be used when sqlite3DebugPrintf() is -** included in the build. */ -int sqlite3OsFileHandle(OsFile *id){ - return id->pMethod->xFileHandle(id); -} -#endif int sqlite3OsFileSize(OsFile *id, i64 *pSize){ return id->pMethod->xFileSize(id, pSize); } @@ -70,9 +62,6 @@ int sqlite3OsLock(OsFile *id, int lockType){ int sqlite3OsUnlock(OsFile *id, int lockType){ return id->pMethod->xUnlock(id, lockType); } -int sqlite3OsLockState(OsFile *id){ - return id->pMethod->xLockState(id); -} int sqlite3OsCheckReservedLock(OsFile *id){ return id->pMethod->xCheckReservedLock(id); } @@ -81,6 +70,16 @@ int sqlite3OsSectorSize(OsFile *id){ return xSectorSize ? xSectorSize(id) : SQLITE_DEFAULT_SECTOR_SIZE; } +#if defined(SQLITE_TEST) || defined(SQLITE_DEBUG) + /* These methods are currently only used for testing and debugging. */ + int sqlite3OsFileHandle(OsFile *id){ + return id->pMethod->xFileHandle(id); + } + int sqlite3OsLockState(OsFile *id){ + return id->pMethod->xLockState(id); + } +#endif + #ifdef SQLITE_ENABLE_REDEF_IO /* ** A function to return a pointer to the virtual function table. diff --git a/src/os.h b/src/os.h index 006ed5e131..c70180ddea 100644 --- a/src/os.h +++ b/src/os.h @@ -352,11 +352,9 @@ int sqlite3OsSeek(OsFile*, i64 offset); int sqlite3OsTruncate(OsFile*, i64 size); int sqlite3OsSync(OsFile*, int); void sqlite3OsSetFullSync(OsFile *id, int setting); -int sqlite3OsFileHandle(OsFile *id); int sqlite3OsFileSize(OsFile*, i64 *pSize); int sqlite3OsLock(OsFile*, int); int sqlite3OsUnlock(OsFile*, int); -int sqlite3OsLockState(OsFile *id); int sqlite3OsCheckReservedLock(OsFile *id); int sqlite3OsOpenReadWrite(const char*, OsFile**, int*); int sqlite3OsOpenExclusive(const char*, OsFile**, int); @@ -383,6 +381,11 @@ void *sqlite3OsDlopen(const char*); void *sqlite3OsDlsym(void*, const char*); int sqlite3OsDlclose(void*); +#if defined(SQLITE_TEST) || defined(SQLITE_DEBUG) + int sqlite3OsFileHandle(OsFile *id); + int sqlite3OsLockState(OsFile *id); +#endif + /* ** If the SQLITE_ENABLE_REDEF_IO macro is defined, then the OS-layer ** interface routines are not called directly but are invoked using diff --git a/src/pager.c b/src/pager.c index 383f576451..288d8cb5bc 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.337 2007/05/08 14:51:37 drh Exp $ +** @(#) $Id: pager.c,v 1.338 2007/05/08 21:45:28 drh Exp $ */ #ifndef SQLITE_OMIT_DISKIO #include "sqliteInt.h" @@ -2186,12 +2186,14 @@ int sqlite3PagerClose(Pager *pPager){ return SQLITE_OK; } +#if !defined(NDEBUG) || defined(SQLITE_TEST) /* ** Return the page number for the given page data. */ Pgno sqlite3PagerPagenumber(DbPage *p){ return p->pgno; } +#endif /* ** The page_ref() function increments the reference count for a page. @@ -2618,7 +2620,7 @@ static int pager_recycle(Pager *pPager, int syncOk, PgHdr **ppPg){ ** free as much memory as possible. The return value is the total number ** of bytes of memory released. */ -#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT +#if defined(SQLITE_ENABLE_MEMORY_MANAGEMENT) && !defined(SQLITE_OMIT_DISKIO) int sqlite3PagerReleaseMemory(int nReq){ const ThreadData *pTsdro = sqlite3ThreadDataReadOnly(); int nReleased = 0; @@ -2694,7 +2696,7 @@ int sqlite3PagerReleaseMemory(int nReq){ return nReleased; } -#endif /* SQLITE_ENABLE_MEMORY_MANAGEMENT */ +#endif /* SQLITE_ENABLE_MEMORY_MANAGEMENT && !SQLITE_OMIT_DISKIO */ /* ** Read the content of page pPg out of the database file. diff --git a/src/pager.h b/src/pager.h index 88b8694b4e..ca193dae1d 100644 --- a/src/pager.h +++ b/src/pager.h @@ -13,7 +13,7 @@ ** subsystem. The page cache subsystem reads and writes a file a page ** at a time and provides a journal for rollback. ** -** @(#) $Id: pager.h,v 1.60 2007/05/08 14:51:37 drh Exp $ +** @(#) $Id: pager.h,v 1.61 2007/05/08 21:45:28 drh Exp $ */ #ifndef _PAGER_H_ @@ -69,9 +69,7 @@ int sqlite3PagerAcquire(Pager *pPager, Pgno pgno, DbPage **ppPage, int clrFlag); DbPage *sqlite3PagerLookup(Pager *pPager, Pgno pgno); int sqlite3PagerRef(DbPage*); int sqlite3PagerUnref(DbPage*); -Pgno sqlite3PagerPagenumber(DbPage*); int sqlite3PagerWrite(DbPage*); -int sqlite3PagerIswriteable(DbPage*); int sqlite3PagerOverwrite(Pager *pPager, Pgno pgno, void*); int sqlite3PagerPagecount(Pager*); int sqlite3PagerTruncate(Pager*,Pgno); @@ -86,29 +84,37 @@ int sqlite3PagerStmtRollback(Pager*); void sqlite3PagerDontRollback(DbPage*); void sqlite3PagerDontWrite(DbPage*); int sqlite3PagerRefcount(Pager*); -int *sqlite3PagerStats(Pager*); void sqlite3PagerSetSafetyLevel(Pager*,int,int); const char *sqlite3PagerFilename(Pager*); const char *sqlite3PagerDirname(Pager*); const char *sqlite3PagerJournalname(Pager*); int sqlite3PagerNosync(Pager*); -int sqlite3PagerRename(Pager*, const char *zNewName); -void sqlite3PagerSetCodec(Pager*,void*(*)(void*,void*,Pgno,int),void*); int sqlite3PagerMovepage(Pager*,DbPage*,Pgno); -int sqlite3PagerReset(Pager*); -int sqlite3PagerReleaseMemory(int); - void *sqlite3PagerGetData(DbPage *); void *sqlite3PagerGetExtra(DbPage *); int sqlite3PagerLockingMode(Pager *, int); +#if defined(SQLITE_ENABLE_MEMORY_MANAGEMENT) && !defined(SQLITE_OMIT_DISKIO) + int sqlite3PagerReleaseMemory(int); +#endif + +#ifdef SQLITE_HAS_CODEC + void sqlite3PagerSetCodec(Pager*,void*(*)(void*,void*,Pgno,int),void*); +#endif + +#if !defined(NDEBUG) || defined(SQLITE_TEST) + Pgno sqlite3PagerPagenumber(DbPage*); + int sqlite3PagerIswriteable(DbPage*); +#endif + #if defined(SQLITE_DEBUG) || defined(SQLITE_TEST) -int sqlite3PagerLockstate(Pager*); + int sqlite3PagerLockstate(Pager*); #endif #ifdef SQLITE_TEST -void sqlite3PagerRefdump(Pager*); -int pager3_refinfo_enable; + int *sqlite3PagerStats(Pager*); + void sqlite3PagerRefdump(Pager*); + int pager3_refinfo_enable; #endif #ifdef SQLITE_TEST diff --git a/src/sqliteInt.h b/src/sqliteInt.h index e19ea3d99f..8daf349bae 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -11,7 +11,7 @@ ************************************************************************* ** Internal interface definitions for SQLite. ** -** @(#) $Id: sqliteInt.h,v 1.561 2007/05/08 20:37:39 drh Exp $ +** @(#) $Id: sqliteInt.h,v 1.562 2007/05/08 21:45:28 drh Exp $ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ @@ -1548,15 +1548,10 @@ extern int sqlite3_always_code_trigger_setup; */ int sqlite3StrICmp(const char *, const char *); int sqlite3StrNICmp(const char *, const char *, int); -int sqlite3HashNoCase(const char *, int); int sqlite3IsNumber(const char*, int*, u8); -int sqlite3Compare(const char *, const char *); -int sqlite3SortCompare(const char *, const char *); -void sqlite3RealToSortable(double r, char *); void *sqlite3Malloc(int,int); void *sqlite3MallocRaw(int,int); -void sqlite3Free(void*); void *sqlite3Realloc(void*,int); char *sqlite3StrDup(const char*); char *sqlite3StrNDup(const char*, int); @@ -1564,12 +1559,16 @@ char *sqlite3StrNDup(const char*, int); void *sqlite3ReallocOrFree(void*,int); void sqlite3FreeX(void*); void *sqlite3MallocX(int); -int sqlite3AllocSize(void *); +#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT + int sqlite3AllocSize(void *); +#endif char *sqlite3MPrintf(const char*, ...); char *sqlite3VMPrintf(const char*, va_list); -void sqlite3DebugPrintf(const char*, ...); -void *sqlite3TextToPtr(const char*); +#if defined(SQLITE_TEST) || defined(SQLITE_DEBUG) + void sqlite3DebugPrintf(const char*, ...); + void *sqlite3TextToPtr(const char*); +#endif void sqlite3SetString(char **, ...); void sqlite3ErrorMsg(Parse*, const char*, ...); void sqlite3ErrorClear(Parse*); @@ -1630,13 +1629,10 @@ void sqlite3SrcListDelete(SrcList*); void sqlite3CreateIndex(Parse*,Token*,Token*,SrcList*,ExprList*,int,Token*, Token*, int, int); void sqlite3DropIndex(Parse*, SrcList*, int); -void sqlite3AddKeyType(Vdbe*, ExprList*); -void sqlite3AddIdxKeyType(Vdbe*, Index*); int sqlite3Select(Parse*, Select*, int, int, Select*, int, int*, char *aff); Select *sqlite3SelectNew(ExprList*,SrcList*,Expr*,ExprList*,Expr*,ExprList*, int,Expr*,Expr*); void sqlite3SelectDelete(Select*); -void sqlite3SelectUnbind(Select*); Table *sqlite3SrcListLookup(Parse*, SrcList*); int sqlite3IsReadOnly(Parse*, Table*, int); void sqlite3OpenTable(Parse*, int iCur, int iDb, Table*, int); @@ -1650,7 +1646,6 @@ void sqlite3ExprCodeAndCache(Parse*, Expr*); int sqlite3ExprCodeExprList(Parse*, ExprList*); void sqlite3ExprIfTrue(Parse*, Expr*, int, int); void sqlite3ExprIfFalse(Parse*, Expr*, int, int); -void sqlite3NextedParse(Parse*, const char*, ...); Table *sqlite3FindTable(sqlite3*,const char*, const char*); Table *sqlite3LocateTable(Parse*,const char*, const char*); Index *sqlite3FindIndex(sqlite3*,const char*, const char*); @@ -1659,7 +1654,6 @@ void sqlite3UnlinkAndDeleteIndex(sqlite3*,int,const char*); void sqlite3Vacuum(Parse*); int sqlite3RunVacuum(char**, sqlite3*); char *sqlite3NameFromToken(Token*); -int sqlite3ExprCheck(Parse*, Expr*, int, int*); int sqlite3ExprCompare(Expr*, Expr*); int sqliteFuncId(Token*); int sqlite3ExprResolveNames(NameContext *, Expr *); @@ -1768,14 +1762,12 @@ void sqlite3Error(sqlite3*, int, const char*,...); void *sqlite3HexToBlob(const char *z); int sqlite3TwoPartName(Parse *, Token *, Token *, Token **); const char *sqlite3ErrStr(int); -int sqlite3ReadUniChar(const char *zStr, int *pOffset, u8 *pEnc, int fold); int sqlite3ReadSchema(Parse *pParse); CollSeq *sqlite3FindCollSeq(sqlite3*,u8 enc, const char *,int,int); CollSeq *sqlite3LocateCollSeq(Parse *pParse, const char *zName, int nName); CollSeq *sqlite3ExprCollSeq(Parse *pParse, Expr *pExpr); Expr *sqlite3ExprSetColl(Parse *pParse, Expr *, Token *); int sqlite3CheckCollSeq(Parse *, CollSeq *); -int sqlite3CheckIndexCollSeq(Parse *, Index *); int sqlite3CheckObjectName(Parse *, const char *); void sqlite3VdbeSetChanges(sqlite3 *, int); void sqlite3Utf16Substr(sqlite3_context *,int,sqlite3_value **); @@ -1801,7 +1793,6 @@ int sqlite3SelectResolve(Parse *, Select *, NameContext *); void sqlite3ColumnDefault(Vdbe *, Table *, int); void sqlite3AlterFinishAddColumn(Parse *, Token *); void sqlite3AlterBeginAddColumn(Parse *, SrcList *); -const char *sqlite3TestErrorName(int); CollSeq *sqlite3GetCollSeq(sqlite3*, CollSeq *, const char *, int); char sqlite3AffinityType(const Token*); void sqlite3Analyze(Parse*, Token*, Token*); diff --git a/src/vdbe.h b/src/vdbe.h index 86e94d9774..f6b145bf1c 100644 --- a/src/vdbe.h +++ b/src/vdbe.h @@ -15,7 +15,7 @@ ** or VDBE. The VDBE implements an abstract machine that runs a ** simple program to access and modify the underlying database. ** -** $Id: vdbe.h,v 1.109 2007/05/08 20:37:40 drh Exp $ +** $Id: vdbe.h,v 1.110 2007/05/08 21:45:28 drh Exp $ */ #ifndef _SQLITE_VDBE_H_ #define _SQLITE_VDBE_H_ @@ -112,7 +112,6 @@ typedef struct VdbeOpList VdbeOpList; ** for a description of what each of these routines does. */ Vdbe *sqlite3VdbeCreate(sqlite3*); -void sqlite3VdbeCreateCallback(Vdbe*, int*); int sqlite3VdbeAddOp(Vdbe*,int,int,int); int sqlite3VdbeOp3(Vdbe*,int,int,int,const char *zP3,int); int sqlite3VdbeAddOpList(Vdbe*, int nOp, VdbeOpList const *aOp); @@ -128,7 +127,9 @@ void sqlite3VdbeMakeReady(Vdbe*,int,int,int,int); int sqlite3VdbeFinalize(Vdbe*); void sqlite3VdbeResolveLabel(Vdbe*, int); int sqlite3VdbeCurrentAddr(Vdbe*); -void sqlite3VdbeTrace(Vdbe*,FILE*); +#ifdef SQLITE_DEBUG + void sqlite3VdbeTrace(Vdbe*,FILE*); +#endif void sqlite3VdbeResetStepResult(Vdbe*); int sqlite3VdbeReset(Vdbe*); void sqlite3VdbeSetNumCols(Vdbe*,int); diff --git a/src/vdbeInt.h b/src/vdbeInt.h index 14a23f15ff..e761775b65 100644 --- a/src/vdbeInt.h +++ b/src/vdbeInt.h @@ -361,9 +361,6 @@ int sqlite3VdbeCursorMoveto(Cursor*); #if defined(SQLITE_DEBUG) || defined(VDBE_PROFILE) void sqlite3VdbePrintOp(FILE*, int, Op*); #endif -#ifdef SQLITE_DEBUG -void sqlite3VdbePrintSql(Vdbe*); -#endif int sqlite3VdbeSerialTypeLen(u32); u32 sqlite3VdbeSerialType(Mem*, int); int sqlite3VdbeSerialPut(unsigned char*, int, Mem*, int); @@ -404,11 +401,14 @@ int sqlite3VdbeMemFromBtree(BtCursor*,int,int,int,Mem*); void sqlite3VdbeMemRelease(Mem *p); int sqlite3VdbeMemFinalize(Mem*, FuncDef*); #ifndef NDEBUG -void sqlite3VdbeMemSanity(Mem*); -int sqlite3VdbeOpcodeNoPush(u8); + void sqlite3VdbeMemSanity(Mem*); + int sqlite3VdbeOpcodeNoPush(u8); #endif int sqlite3VdbeMemTranslate(Mem*, u8); -void sqlite3VdbeMemPrettyPrint(Mem *pMem, char *zBuf); +#ifdef SQLITE_DEBUG + void sqlite3VdbePrintSql(Vdbe*); + void sqlite3VdbeMemPrettyPrint(Mem *pMem, char *zBuf); +#endif int sqlite3VdbeMemHandleBom(Mem *pMem); void sqlite3VdbeFifoInit(Fifo*); int sqlite3VdbeFifoPush(Fifo*, i64);