diff options
Diffstat (limited to '')
| -rw-r--r-- | src/logsmanagement/db_api.c (renamed from logsmanagement/db_api.c) | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/logsmanagement/db_api.c b/src/logsmanagement/db_api.c index ae0914433..50018ea26 100644 --- a/logsmanagement/db_api.c +++ b/src/logsmanagement/db_api.c @@ -146,7 +146,7 @@ static void db_writer_db_mode_none(void *arg){ } } -#define return_db_writer_db_mode_none(p_file_info, do_mut_unlock){ \ +#define return_db_writer_db_mode_none(p_file_info, do_mut_unlock) do { \ p_file_info->db_mode = LOGS_MANAG_DB_MODE_NONE; \ freez((void *) p_file_info->db_dir); \ p_file_info->db_dir = strdupz(""); \ @@ -165,7 +165,7 @@ static void db_writer_db_mode_none(void *arg){ return fatal_assert(!uv_thread_create( p_file_info->db_writer_thread, \ db_writer_db_mode_none, \ p_file_info)); \ -} +} while(0) static void db_writer_db_mode_full(void *arg){ int rc = 0; @@ -754,9 +754,9 @@ int db_init() { -1, &stmt_init_BLOBS_table, NULL); do_sqlite_error_check(p_file_info, rc, SQLITE_OK); - for(int i = 0; i < BLOB_MAX_FILES; i++){ + for(int t = 0; t < BLOB_MAX_FILES; t++){ char filename[FILENAME_MAX + 1]; - snprintfz(filename, FILENAME_MAX, BLOB_STORE_FILENAME "%d", i); + snprintfz(filename, FILENAME_MAX, BLOB_STORE_FILENAME "%d", t); if(unlikely( SQLITE_OK != (rc = sqlite3_bind_text(stmt_init_BLOBS_table, 1, filename, -1, NULL)) || SQLITE_OK != (rc = sqlite3_bind_int64(stmt_init_BLOBS_table, 2, (sqlite3_int64) 0)) || @@ -919,10 +919,10 @@ int db_init() { -1, &stmt_update_id, NULL); do_sqlite_error_check(p_file_info, rc, SQLITE_OK); - for (int i = 0; i < BLOB_MAX_FILES; i++){ + for (int t = 0; t < BLOB_MAX_FILES; t++){ if(unlikely( - SQLITE_OK != (rc = sqlite3_bind_int(stmt_update_id, 1, i + 1)) || - SQLITE_OK != (rc = sqlite3_bind_int(stmt_update_id, 2, old_blobs_table_ids[i])) || + SQLITE_OK != (rc = sqlite3_bind_int(stmt_update_id, 1, t + 1)) || + SQLITE_OK != (rc = sqlite3_bind_int(stmt_update_id, 2, old_blobs_table_ids[t])) || SQLITE_DONE != (rc = sqlite3_step(stmt_update_id)) || SQLITE_OK != (rc = sqlite3_reset(stmt_update_id)))) { throw_error(p_file_info->chartname, ERR_TYPE_SQLITE, rc, __LINE__, __FILE__, __FUNCTION__); |