1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-14 00:22:38 +03:00

Simplify the symbol hash table to use only a single key class. Other

changes to improve code coverage. (CVS 5794)

FossilOrigin-Name: ff50a8a7e5a15fac192939ff3206fa18d1c5a6dd
This commit is contained in:
drh
2008-10-10 17:41:28 +00:00
parent adfae6c68b
commit 1b67f3caf2
9 changed files with 66 additions and 195 deletions

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.504 2008/10/07 19:53:14 drh Exp $
** $Id: main.c,v 1.505 2008/10/10 17:41:29 drh Exp $
*/
#include "sqliteInt.h"
#include <ctype.h>
@@ -216,12 +216,10 @@ int sqlite3_shutdown(void){
if( sqlite3GlobalConfig.isInit ){
sqlite3_os_end();
}
if( sqlite3GlobalConfig.m.xShutdown ){
sqlite3MallocEnd();
}
if( sqlite3GlobalConfig.mutex.xMutexEnd ){
sqlite3MutexEnd();
}
assert( sqlite3GlobalConfig.m.xShutdown!=0 );
sqlite3MallocEnd();
assert( sqlite3GlobalConfig.mutex.xMutexEnd!=0 );
sqlite3MutexEnd();
sqlite3GlobalConfig.isInit = 0;
return SQLITE_OK;
}
@@ -1500,9 +1498,9 @@ static int openDatabase(
| SQLITE_LoadExtension
#endif
;
sqlite3HashInit(&db->aCollSeq, SQLITE_HASH_STRING, 0);
sqlite3HashInit(&db->aCollSeq, 0);
#ifndef SQLITE_OMIT_VIRTUALTABLE
sqlite3HashInit(&db->aModule, SQLITE_HASH_STRING, 0);
sqlite3HashInit(&db->aModule, 0);
#endif
db->pVfs = sqlite3_vfs_find(zVfs);
@@ -1627,7 +1625,8 @@ static int openDatabase(
#endif
/* Enable the lookaside-malloc subsystem */
setupLookaside(db, 0, sqlite3GlobalConfig.szLookaside, sqlite3GlobalConfig.nLookaside);
setupLookaside(db, 0, sqlite3GlobalConfig.szLookaside,
sqlite3GlobalConfig.nLookaside);
opendb_out:
if( db ){