diff options
Diffstat (limited to 'src/tclsqlite.c')
| -rw-r--r-- | src/tclsqlite.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/tclsqlite.c b/src/tclsqlite.c index abec51e67..0a586e489 100644 --- a/src/tclsqlite.c +++ b/src/tclsqlite.c @@ -42,14 +42,6 @@ #include <ctype.h> /* -** This function is used to translate a return code into an error -** message. -*/ -#ifndef USE_SYSTEM_SQLITE -const char *sqlite3ErrStr(int rc); -#endif - -/* * Windows needs to know which symbols to export. Unix does not. * BUILD_sqlite should be undefined for Unix. */ @@ -2566,7 +2558,7 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){ pKey = Tcl_GetByteArrayFromObj(objv[2], &nKey); rc = sqlite3_rekey(pDb->db, pKey, nKey); if( rc ){ - Tcl_AppendResult(interp, sqlite3ErrStr(rc), 0); + Tcl_AppendResult(interp, sqlite3_errstr(rc), 0); rc = TCL_ERROR; } #endif @@ -3044,19 +3036,15 @@ static int DbMain(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){ zFile = Tcl_TranslateFileName(interp, zFile, &translatedFilename); rc = sqlite3_open_v2(zFile, &p->db, flags, zVfs); Tcl_DStringFree(&translatedFilename); -#ifndef USE_SYSTEM_SQLITE if( p->db ){ -#endif if( SQLITE_OK!=sqlite3_errcode(p->db) ){ zErrMsg = sqlite3_mprintf("%s", sqlite3_errmsg(p->db)); sqlite3_close(p->db); p->db = 0; } -#ifndef USE_SYSTEM_SQLITE }else{ - zErrMsg = sqlite3_mprintf("%s", sqlite3ErrStr(rc)); + zErrMsg = sqlite3_mprintf("%s", sqlite3_errstr(rc)); } -#endif #ifdef SQLITE_HAS_CODEC if( p->db ){ sqlite3_key(p->db, pKey, nKey); |