diff --git a/inc/lektor/internal/dbmacro.h b/inc/lektor/internal/dbmacro.h index 07cc8ff7714001e5544f12c817a9ff319f12eb7f..9f87666fc11f0d75740dff26aebf24cfa468435f 100644 --- a/inc/lektor/internal/dbmacro.h +++ b/inc/lektor/internal/dbmacro.h @@ -64,7 +64,7 @@ #define sqlite3_column_chars (const char *)sqlite3_column_text -#define __INVALID_CHARS_DBPATH ":?!'\"" -#define __is_sql_str_invalid(str) strcspn(str, __INVALID_CHARS_DBPATH) != strlen(str) +#define ___INVALID_CHARS_DBPATH ":?!'\"" +#define ___is_sql_str_invalid(str) strcspn(str, ___INVALID_CHARS_DBPATH) != strlen(str) #endif /* __LKT_DATABASE_MACRO_H__ */ diff --git a/src/database/open.c b/src/database/open.c index 41b3870915b0f3094b23ebc16d06298748dd6c29..3722eaeeea0c48ac3a4bb01a880c8a8da3d6fbd6 100644 --- a/src/database/open.c +++ b/src/database/open.c @@ -25,7 +25,7 @@ static int db_stack_init = 0; static pthread_mutex_t mtx = PTHREAD_MUTEX_INITIALIZER; PRIVATE_FUNCTION void -__dec(volatile sqlite3 *db, const char *name) +___dec(volatile sqlite3 *db, const char *name) { char SQL[LKT_MAX_SQLITE_STATEMENT]; safe_snprintf(SQL, LKT_MAX_SQLITE_STATEMENT, "UPDATE %s.misc SET opened = 0;", name); @@ -45,7 +45,7 @@ database_close_all(void) struct named_db *item; while (!stack_empty(&db_stack)) { stack_pop(&db_stack, (void **)&item); - __dec(item->db, item->name); + ___dec(item->db, item->name); free((void *)item->name); free(item); } @@ -54,7 +54,7 @@ database_close_all(void) } PRIVATE_FUNCTION void -__inc(volatile sqlite3 *db, const char *name, bool check) +___inc(volatile sqlite3 *db, const char *name, bool check) { SQLITE_EXEC(db, "UPDATE misc SET opened = (SELECT opened + 1 FROM misc);", error); @@ -72,7 +72,7 @@ error: LOG_ERROR("DB", "Database already in use"); if (check) exit(EXIT_FAILURE); - __dec(db, name); + ___dec(db, name); } bool @@ -104,7 +104,7 @@ err_pragma: } PRIVATE_FUNCTION bool -__attach(volatile sqlite3 *db, const char *name, const char *path) +___attach(volatile sqlite3 *db, const char *name, const char *path) { static const char SQL_ATTACH_TEMPLATE[] = "ATTACH '%s' AS '%s';"; char SQL_ATTACH[LKT_MAX_SQLITE_STATEMENT]; @@ -119,7 +119,7 @@ err_no_attach: } PRIVATE_FUNCTION bool -__detach(volatile sqlite3 *db, const char *name) +___detach(volatile sqlite3 *db, const char *name) { static const char SQL_DETACH_TEMPLATE[] = "DETACH '%s';\n"; char SQL_DETACH[LKT_MAX_SQLITE_STATEMENT]; @@ -157,7 +157,7 @@ error: } PRIVATE_FUNCTION bool -__is_attached(volatile sqlite3 *db, const char *name) +___is_attached(volatile sqlite3 *db, const char *name) { static const char *SQL_STMT = "SELECT name FROM pragma_database_list WHERE name = ?;\n"; sqlite3_stmt *stmt = NULL; @@ -176,18 +176,18 @@ bool database_open(volatile sqlite3 *db, const char *dbpath, bool check) { bool retry = false; - if (__is_sql_str_invalid(dbpath)) { + if (___is_sql_str_invalid(dbpath)) { LOG_ERROR("DB", "The database path '%s' is invalid", dbpath); return false; } /* Try the simple attach, for already initialized database */ retry: - if (!__attach(db, LKT_PROTECTED_DATABASE, dbpath)) + if (!___attach(db, LKT_PROTECTED_DATABASE, dbpath)) goto init; if (!__check_schema(db)) goto init; - __inc(db, LKT_PROTECTED_DATABASE, check); + ___inc(db, LKT_PROTECTED_DATABASE, check); LKT_DATABASE_VERSION version = database_get_version(db); switch (version) { @@ -210,7 +210,7 @@ init: retry = true; LOG_WARN("DB", "Database '%s' is not correctly initialized, init it", dbpath); - __detach(db, LKT_PROTECTED_DATABASE); + ___detach(db, LKT_PROTECTED_DATABASE); if (database_init(dbpath)) goto retry; @@ -229,17 +229,17 @@ database_attach(volatile sqlite3 *db, const char *name, const char *dbpath) "database with the same name", false); - if (__is_sql_str_invalid(name)) { + if (___is_sql_str_invalid(name)) { LOG_ERROR("DB", "The database name '%s' is invalid", name); return false; } - if (__is_attached(db, name)) { + if (___is_attached(db, name)) { LOG_ERROR("DB", "The database '%s' is already attached", name); return false; } - if (!__attach(db, name, dbpath)) { + if (!___attach(db, name, dbpath)) { LOG_ERROR("DB", "Failed to attach database named '%s' with path '%s'", name, dbpath); return false; } @@ -254,17 +254,17 @@ database_detach(volatile sqlite3 *db, const char *name) RETURN_UNLESS(strcasecmp(LKT_PROTECTED_DATABASE, name), " The database " LKT_PROTECTED_DATABASE " is protected, can't detach it", false); - if (__is_sql_str_invalid(name)) { + if (___is_sql_str_invalid(name)) { LOG_ERROR("DB", "The database name '%s' is invalid", name); return false; } - if (!__is_attached(db, name)) { + if (!___is_attached(db, name)) { LOG_ERROR("DB", "The database '%s' is not attached", name); return false; } - if (!__detach(db, name)) { + if (!___detach(db, name)) { LOG_ERROR("DB", "Failed to detach database named %s", name); return false; } diff --git a/src/database/playlist.c b/src/database/playlist.c index 0893a880bbbf68e5e68bff5b7d822ddec8ef0c1c..3823b70b8c62865add02aa4093f9e94b073b9289 100644 --- a/src/database/playlist.c +++ b/src/database/playlist.c @@ -123,7 +123,7 @@ database_plt_export(volatile sqlite3 *db, const char *name) int code, ret = false; sqlite3_stmt *stmt = NULL; - if (__is_sql_str_invalid(name)) { + if (___is_sql_str_invalid(name)) { LOG_ERROR("DB", "The playlist name '%s' is invalid", name); goto error; } @@ -156,7 +156,7 @@ database_plt_import(volatile sqlite3 *db, const char *name) " FROM %s.content;\n"; char SQL_STMT[LKT_MAX_SQLITE_STATEMENT], ret = false; - if (__is_sql_str_invalid(name)) { + if (___is_sql_str_invalid(name)) { LOG_ERROR("DB", "The playlist name '%s' is invalid", name); goto error; } diff --git a/src/database/queue.c b/src/database/queue.c index 259416cc83a969610c68f68f64913567df4aaa48..2dcdf87d03491c6e889147b1ca68957467866d49 100644 --- a/src/database/queue.c +++ b/src/database/queue.c @@ -209,7 +209,7 @@ queue_add_with_col_like_str(volatile sqlite3 *db, const char *col, const char *v " WHERE %s LIKE ? AND available = 1" " ORDER BY RANDOM();"; - RETURN_IF(__is_sql_str_invalid(col), "Column name is invalid", false); + RETURN_IF(___is_sql_str_invalid(col), "Column name is invalid", false); char SQL[LKT_MAX_SQLITE_STATEMENT]; sqlite3_stmt *stmt = NULL;