diff options
author | drh <> | 2021-08-07 23:16:52 +0000 |
---|---|---|
committer | drh <> | 2021-08-07 23:16:52 +0000 |
commit | 5f9de6ecf4402f63e700667f579cb6645f9ac7c6 (patch) | |
tree | 83cb3ab927f7a377fa5cbde7e0932827dba186fd /src/util.c | |
parent | b419452c7e5718d4151ed845d5b2ddd0e6ac0d05 (diff) | |
download | sqlite-5f9de6ecf4402f63e700667f579cb6645f9ac7c6.tar.gz sqlite-5f9de6ecf4402f63e700667f579cb6645f9ac7c6.zip |
Refactor sqlite3.magic into sqlite3.eOpenState.
FossilOrigin-Name: e5d6512aa1fa0016a679c6e0cb665a0c67ad16f1daa0c18a96b2ebae1beefd15
Diffstat (limited to 'src/util.c')
-rw-r--r-- | src/util.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/util.c b/src/util.c index fc838023c..89e3e56f1 100644 --- a/src/util.c +++ b/src/util.c @@ -1399,13 +1399,13 @@ static void logBadConnection(const char *zType){ ** used as an argument to sqlite3_errmsg() or sqlite3_close(). */ int sqlite3SafetyCheckOk(sqlite3 *db){ - u32 magic; + u8 eOpenState; if( db==0 ){ logBadConnection("NULL"); return 0; } - magic = db->magic; - if( magic!=SQLITE_MAGIC_OPEN ){ + eOpenState = db->eOpenState; + if( eOpenState!=SQLITE_STATE_OPEN ){ if( sqlite3SafetyCheckSickOrOk(db) ){ testcase( sqlite3GlobalConfig.xLog!=0 ); logBadConnection("unopened"); @@ -1416,11 +1416,11 @@ int sqlite3SafetyCheckOk(sqlite3 *db){ } } int sqlite3SafetyCheckSickOrOk(sqlite3 *db){ - u32 magic; - magic = db->magic; - if( magic!=SQLITE_MAGIC_SICK && - magic!=SQLITE_MAGIC_OPEN && - magic!=SQLITE_MAGIC_BUSY ){ + u8 eOpenState; + eOpenState = db->eOpenState; + if( eOpenState!=SQLITE_STATE_SICK && + eOpenState!=SQLITE_STATE_OPEN && + eOpenState!=SQLITE_STATE_BUSY ){ testcase( sqlite3GlobalConfig.xLog!=0 ); logBadConnection("invalid"); return 0; |