diff options
| author |   jturner <jturner@openbsd.org> | 2015-03-16 00:06:33 +0000 |
|---|---|---|
| committer | jturner <jturner@openbsd.org> | 2015-03-16 00:06:33 +0000 |
| commit | 476ed7b902c71c189883939f8fb66a03e3eb82d9 (patch) | |
| tree | ac10f46a6d4287dd3790a3815808837f9318d24b /lib/libsqlite3/src/legacy.c | |
| parent | from zhuk: two grammar fixes; (diff) | |
| download | wireguard-openbsd-476ed7b902c71c189883939f8fb66a03e3eb82d9.tar.xz wireguard-openbsd-476ed7b902c71c189883939f8fb66a03e3eb82d9.zip | |
Update sqlite3 to 3.8.7.4. Changes available here: http://sqlite.org/changes.html#version_3_8_7_4
ok landry@
Diffstat (limited to 'lib/libsqlite3/src/legacy.c')
| -rw-r--r-- | lib/libsqlite3/src/legacy.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libsqlite3/src/legacy.c b/lib/libsqlite3/src/legacy.c index 1913f0b5af6..a10006e5584 100644 --- a/lib/libsqlite3/src/legacy.c +++ b/lib/libsqlite3/src/legacy.c @@ -44,7 +44,7 @@ int sqlite3_exec( if( zSql==0 ) zSql = ""; sqlite3_mutex_enter(db->mutex); - sqlite3Error(db, SQLITE_OK, 0); + sqlite3Error(db, SQLITE_OK); while( rc==SQLITE_OK && zSql[0] ){ int nCol; char **azVals = 0; @@ -102,7 +102,7 @@ int sqlite3_exec( rc = SQLITE_ABORT; sqlite3VdbeFinalize((Vdbe *)pStmt); pStmt = 0; - sqlite3Error(db, SQLITE_ABORT, 0); + sqlite3Error(db, SQLITE_ABORT); goto exec_out; } } @@ -125,14 +125,14 @@ exec_out: sqlite3DbFree(db, azCols); rc = sqlite3ApiExit(db, rc); - if( rc!=SQLITE_OK && ALWAYS(rc==sqlite3_errcode(db)) && pzErrMsg ){ + if( rc!=SQLITE_OK && pzErrMsg ){ int nErrMsg = 1 + sqlite3Strlen30(sqlite3_errmsg(db)); *pzErrMsg = sqlite3Malloc(nErrMsg); if( *pzErrMsg ){ memcpy(*pzErrMsg, sqlite3_errmsg(db), nErrMsg); }else{ rc = SQLITE_NOMEM; - sqlite3Error(db, SQLITE_NOMEM, 0); + sqlite3Error(db, SQLITE_NOMEM); } }else if( pzErrMsg ){ *pzErrMsg = 0; |