From abcdba2f181555469964e90727065c0d36b35327 Mon Sep 17 00:00:00 2001 From: Stephen Lombardo Date: Mon, 15 Jul 2024 13:40:45 -0400 Subject: [PATCH] Renames log subsystem to source (e.g. PRAGMA cipher_log_source) --- src/crypto.c | 24 ++++++++++++------------ src/crypto.h | 10 +++++----- src/crypto_impl.c | 20 ++++++++++---------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/crypto.c b/src/crypto.c index 30edbf42..e6493867 100644 --- a/src/crypto.c +++ b/src/crypto.c @@ -700,22 +700,22 @@ int sqlcipher_codec_pragma(sqlite3* db, int iDb, Parse *pParse, const char *zLef } else { level = sqlcipher_get_log_level(); } - sqlcipher_vdbe_return_string(pParse, "cipher_log_level", sqlcipher_get_log_subsystem_str(level), P4_TRANSIENT); + sqlcipher_vdbe_return_string(pParse, "cipher_log_level", sqlcipher_get_log_source_str(level), P4_TRANSIENT); } else - if( sqlite3_stricmp(zLeft, "cipher_log_subsystem")==0 ){ - unsigned int subsys = SQLCIPHER_LOG_NONE; + if( sqlite3_stricmp(zLeft, "cipher_log_source")==0 ){ + unsigned int source = SQLCIPHER_LOG_NONE; if(zRight) { - if(sqlite3_stricmp(zRight, "NONE" )==0) subsys = SQLCIPHER_LOG_NONE; - else if(sqlite3_stricmp(zRight, "ALL" )==0) subsys = SQLCIPHER_LOG_ALL; - else if(sqlite3_stricmp(zRight, "CORE" )==0) subsys = SQLCIPHER_LOG_CORE; - else if(sqlite3_stricmp(zRight, "MEMORY" )==0) subsys = SQLCIPHER_LOG_MEMORY; - else if(sqlite3_stricmp(zRight, "MUTEX" )==0) subsys = SQLCIPHER_LOG_MUTEX; - else if(sqlite3_stricmp(zRight, "PROVIDER")==0) subsys = SQLCIPHER_LOG_PROVIDER; - sqlcipher_set_log_subsystem(subsys); + if(sqlite3_stricmp(zRight, "NONE" )==0) source = SQLCIPHER_LOG_NONE; + else if(sqlite3_stricmp(zRight, "ALL" )==0) source = SQLCIPHER_LOG_ALL; + else if(sqlite3_stricmp(zRight, "CORE" )==0) source = SQLCIPHER_LOG_CORE; + else if(sqlite3_stricmp(zRight, "MEMORY" )==0) source = SQLCIPHER_LOG_MEMORY; + else if(sqlite3_stricmp(zRight, "MUTEX" )==0) source = SQLCIPHER_LOG_MUTEX; + else if(sqlite3_stricmp(zRight, "PROVIDER")==0) source = SQLCIPHER_LOG_PROVIDER; + sqlcipher_set_log_source(source); } else { - subsys = sqlcipher_get_log_subsystem(); + source = sqlcipher_get_log_source(); } - sqlcipher_vdbe_return_string(pParse, "cipher_log_subsystem", sqlcipher_get_log_subsystem_str(subsys), P4_TRANSIENT); + sqlcipher_vdbe_return_string(pParse, "cipher_log_source", sqlcipher_get_log_source_str(source), P4_TRANSIENT); } else if( sqlite3_stricmp(zLeft, "cipher_log")== 0 && zRight ){ char *status = sqlite3_mprintf("%d", sqlcipher_set_log(zRight)); diff --git a/src/crypto.h b/src/crypto.h index 2bbf1e45..23003b81 100644 --- a/src/crypto.h +++ b/src/crypto.h @@ -332,11 +332,11 @@ int sqlcipher_codec_ctx_integrity_check(codec_ctx *, Parse *, char *); int sqlcipher_set_log(const char *destination); void sqlcipher_set_log_level(unsigned int level); unsigned int sqlcipher_get_log_level(); -void sqlcipher_set_log_subsystem(unsigned int subsys); -unsigned int sqlcipher_get_log_subsystem(); +void sqlcipher_set_log_source(unsigned int source); +unsigned int sqlcipher_get_log_source(); char *sqlcipher_get_log_level_str(unsigned int); -char *sqlcipher_get_log_subsystem_str(unsigned int); +char *sqlcipher_get_log_source_str(unsigned int); #define SQLCIPHER_LOG_NONE 0x00 #define SQLCIPHER_LOG_ERROR 0x01 @@ -352,9 +352,9 @@ char *sqlcipher_get_log_subsystem_str(unsigned int); #define SQLCIPHER_LOG_PROVIDER 0x08 #ifdef SQLCIPHER_OMIT_LOG -#define sqlcipher_log(level, subsys, message, ...) +#define sqlcipher_log(level, source, message, ...) #else -void sqlcipher_log(unsigned int level, unsigned int subsys, const char *message, ...); +void sqlcipher_log(unsigned int level, unsigned int source, const char *message, ...); #endif void sqlcipher_vdbe_return_string(Parse*, const char*, const char*, int); diff --git a/src/crypto_impl.c b/src/crypto_impl.c index e54cb4eb..6bd19031 100644 --- a/src/crypto_impl.c +++ b/src/crypto_impl.c @@ -81,7 +81,7 @@ static sqlite3_mutex* sqlcipher_static_mutex[SQLCIPHER_MUTEX_COUNT]; static FILE* sqlcipher_log_file = NULL; static volatile int sqlcipher_log_device = 0; static volatile unsigned int sqlcipher_log_level = SQLCIPHER_LOG_NONE; -static volatile unsigned int sqlcipher_log_subsys = SQLCIPHER_LOG_ALL; +static volatile unsigned int sqlcipher_log_source = SQLCIPHER_LOG_ALL; static volatile int sqlcipher_log_set = 0; sqlite3_mutex* sqlcipher_mutex(int mutex) { @@ -1751,8 +1751,8 @@ char *sqlcipher_get_log_level_str(unsigned int level) { return "NONE"; } -char *sqlcipher_get_log_subsystem_str(unsigned int subsys) { - switch(subsys) { +char *sqlcipher_get_log_source_str(unsigned int source) { + switch(source) { case SQLCIPHER_LOG_NONE: return "NONE"; case SQLCIPHER_LOG_CORE: @@ -1773,7 +1773,7 @@ char *sqlcipher_get_log_subsystem_str(unsigned int subsys) { #define FILETIME_1970 116444736000000000ull /* seconds between 1/1/1601 and 1/1/1970 */ #define HECTONANOSEC_PER_SEC 10000000ull #define MAX_LOG_LEN 8192 -void sqlcipher_log(unsigned int level, unsigned int subsys, const char *message, ...) { +void sqlcipher_log(unsigned int level, unsigned int source, const char *message, ...) { va_list params; va_start(params, message); char formatted[MAX_LOG_LEN]; @@ -1803,14 +1803,14 @@ void sqlcipher_log(unsigned int level, unsigned int subsys, const char *message, #endif if( level > sqlcipher_log_level /* log level is higher, e.g. level filter is at ERROR but this message is DEBUG */ - || (sqlcipher_log_subsys & subsys) == 0 /* subsystem filter doesn't match this message subsys */ + || (sqlcipher_log_source & source) == 0 /* source filter doesn't match this message source */ || (sqlcipher_log_device == 0 && sqlcipher_log_file == NULL) /* no configured log target */ ) { /* skip logging this message */ goto end; } - sqlite3_snprintf(MAX_LOG_LEN, formatted, "%s %s |", sqlcipher_get_log_level_str(level), sqlcipher_get_log_subsystem_str(subsys)); + sqlite3_snprintf(MAX_LOG_LEN, formatted, "%s %s ", sqlcipher_get_log_level_str(level), sqlcipher_get_log_source_str(source)); len = strlen(formatted); sqlite3_vsnprintf(MAX_LOG_LEN - len, formatted + len, message, params); @@ -1865,12 +1865,12 @@ unsigned int sqlcipher_get_log_level() { return sqlcipher_log_level; } -void sqlcipher_set_log_subsystem(unsigned int subsys) { - sqlcipher_log_subsys = subsys; +void sqlcipher_set_log_source(unsigned int source) { + sqlcipher_log_source = source; } -unsigned int sqlcipher_get_log_subsystem() { - return sqlcipher_log_subsys; +unsigned int sqlcipher_get_log_source() { + return sqlcipher_log_source; } int sqlcipher_set_log(const char *destination){ -- 2.11.4.GIT