database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-05 15:55:57 +03:00
Code Activity

Remove the sqlite3_error_string() API. (CVS 1514)

Browse Source 
FossilOrigin-Name: af8e2006d808031a040f293c44f3bfbe841b866b
This commit is contained in:
danielk1977
2004-05-31 23:56:42 +00:00
parent 218dc69436
commit f20b21c8fd
11 changed files with 45 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main.c
View File

@@ -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.200 2004/05/31 19:34:33 drh Exp $
** $Id: main.c,v 1.201 2004/05/31 23:56:43 danielk1977 Exp $
*/
#include "sqliteInt.h"
#include "os.h"
@@ -212,7 +212,7 @@ static int sqlite3InitOne(sqlite *db, int iDb, char **pzErrMsg){
if( db->aDb[iDb].pBt==0 ) return SQLITE_OK;
rc = sqlite3BtreeCursor(db->aDb[iDb].pBt, MASTER_ROOT, 0, 0, 0, &curMain);
if( rc!=SQLITE_OK && rc!=SQLITE_EMPTY ){
sqlite3SetString(pzErrMsg, sqlite3_error_string(rc), (char*)0);
sqlite3SetString(pzErrMsg, sqlite3ErrStr(rc), (char*)0);
return rc;
}
@@ -239,7 +239,7 @@ static int sqlite3InitOne(sqlite *db, int iDb, char **pzErrMsg){
rc = sqlite3BtreeGetMeta(db->aDb[iDb].pBt, i+1, &meta[i]);
}
if( rc ){
sqlite3SetString(pzErrMsg, sqlite3_error_string(rc), (char*)0);
sqlite3SetString(pzErrMsg, sqlite3ErrStr(rc), (char*)0);
sqlite3BtreeCloseCursor(curMain);
return rc;
}
@@ -493,7 +493,7 @@ void sqlite3RollbackAll(sqlite *db){
** Return a static string that describes the kind of error specified in the
** argument.
*/
const char *sqlite3_error_string(int rc){
const char *sqlite3ErrStr(int rc){
const char *z;
switch( rc ){
case SQLITE_OK: z = "not an error"; break;
@@ -789,12 +789,12 @@ const char *sqlite3_errmsg(sqlite3 *db){
/* If db is NULL, then assume that a malloc() failed during an
** sqlite3_open() call.
*/
return sqlite3_error_string(SQLITE_NOMEM);
return sqlite3ErrStr(SQLITE_NOMEM);
}
if( db->zErrMsg ){
return db->zErrMsg;
}
return sqlite3_error_string(db->errCode);
return sqlite3ErrStr(db->errCode);
}
/*