database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-10 01:02:56 +03:00
Code Activity

Fix for registration of non-default vfs objects. (CVS 4360)

Browse Source 
FossilOrigin-Name: 5f48fb95c26a713b3259ee49fd444108030376dc
This commit is contained in:
danielk1977
2007-09-01 06:51:27 +00:00
parent c3f759bd33
commit 95c8a54c7d
9 changed files with 39 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
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.401 2007/08/31 16:11:36 drh Exp $
** $Id: main.c,v 1.402 2007/09/01 06:51:28 danielk1977 Exp $
*/
#include "sqliteInt.h"
#include <ctype.h>
@@ -950,7 +950,6 @@ static int openDatabase(
goto opendb_out;
}
sqlite3_mutex_enter(db->mutex);
db->pVfs = sqlite3_vfs_find(zVfs);
db->errMask = 0xff;
db->priorNewRowid = 0;
db->nDb = 2;
@@ -971,6 +970,14 @@ static int openDatabase(
sqlite3HashInit(&db->aModule, SQLITE_HASH_STRING, 0);
#endif
db->pVfs = sqlite3_vfs_find(zVfs);
if( !db->pVfs ){
rc = SQLITE_ERROR;
db->magic = SQLITE_MAGIC_CLOSED;
sqlite3Error(db, rc, "no such vfs: %s", (zVfs?zVfs:"(null)"));
goto opendb_out;
}
/* Add the default collation sequence BINARY. BINARY works for both UTF-8
** and UTF-16, so add a version for each to avoid any unnecessary
** conversions. The only error that can occur here is a malloc() failure.