Code cleanup (#16448)

* Code cleanup

* More cleanup

* More cleanup

* Use FILENAME_MAX

* query fix

1 files changed, 17 insertions, 17 deletions

diff --git a/database/sqlite/sqlite_aclk.c b/database/sqlite/sqlite_aclk.c
index 480148137d..56b9574a92 100644
--- a/database/sqlite/sqlite_aclk.c
+++ b/database/sqlite/sqlite_aclk.c
@@ -164,7 +164,7 @@ static int create_host_callback(void *data, int argc, char **argv, char **column
 
 #ifdef ENABLE_ACLK
 
-#define SQL_SELECT_HOST_BY_UUID  "SELECT host_id FROM host WHERE host_id = @host_id;"
+#define SQL_SELECT_HOST_BY_UUID  "SELECT host_id FROM host WHERE host_id = @host_id"
 static int is_host_available(uuid_t *host_id)
 {
     sqlite3_stmt *res = NULL;
@@ -223,7 +223,7 @@ static void sql_delete_aclk_table_list(char *host_guid)
     BUFFER *sql = buffer_create(ACLK_SYNC_QUERY_SIZE, &netdata_buffers_statistics.buffers_sqlite);
 
     buffer_sprintf(sql,"SELECT 'drop '||type||' IF EXISTS '||name||';' FROM sqlite_schema " \
-                        "WHERE name LIKE 'aclk_%%_%s' AND type IN ('table', 'trigger', 'index');", uuid_str);
+                        "WHERE name LIKE 'aclk_%%_%s' AND type IN ('table', 'trigger', 'index')", uuid_str);
 
     rc = sqlite3_prepare_v2(db_meta, buffer_tostring(sql), -1, &res, 0);
     if (rc != SQLITE_OK) {
@@ -303,7 +303,7 @@ static int sql_check_aclk_table(void *data __maybe_unused, int argc __maybe_unus
 }
 
 #define SQL_SELECT_ACLK_ACTIVE_LIST "SELECT REPLACE(SUBSTR(name,19),'_','-') FROM sqlite_schema " \
-        "WHERE name LIKE 'aclk_chart_latest_%' AND type IN ('table');"
+        "WHERE name LIKE 'aclk_chart_latest_%' AND type IN ('table')"
 
 static void sql_check_aclk_table_list(void)
 {
@@ -315,18 +315,18 @@ static void sql_check_aclk_table_list(void)
     }
 }
 
-#define SQL_ALERT_CLEANUP "DELETE FROM aclk_alert_%s WHERE date_submitted IS NOT NULL AND CAST(date_cloud_ack AS INT) < unixepoch()-%d;"
+#define SQL_ALERT_CLEANUP "DELETE FROM aclk_alert_%s WHERE date_submitted IS NOT NULL AND CAST(date_cloud_ack AS INT) < unixepoch()-%d"
 
 static int sql_maint_aclk_sync_database(void *data __maybe_unused, int argc __maybe_unused, char **argv, char **column __maybe_unused)
 {
-    char sql[512];
-    snprintfz(sql,511, SQL_ALERT_CLEANUP, (char *) argv[0], ACLK_DELETE_ACK_ALERTS_INTERNAL);
+    char sql[ACLK_SYNC_QUERY_SIZE];
+    snprintfz(sql,sizeof(sql) - 1, SQL_ALERT_CLEANUP, (char *) argv[0], ACLK_DELETE_ACK_ALERTS_INTERNAL);
     if (unlikely(db_execute(db_meta, sql)))
         error_report("Failed to clean stale ACLK alert entries");
     return 0;
 }
 
-#define SQL_SELECT_ACLK_ALERT_LIST "SELECT SUBSTR(name,12) FROM sqlite_schema WHERE name LIKE 'aclk_alert_%' AND type IN ('table');"
+#define SQL_SELECT_ACLK_ALERT_LIST "SELECT SUBSTR(name,12) FROM sqlite_schema WHERE name LIKE 'aclk_alert_%' AND type IN ('table')"
 
 static void sql_maint_aclk_sync_database_all(void)
 {
@@ -368,9 +368,7 @@ static void timer_cb(uv_timer_t *handle)
     struct aclk_database_cmd cmd;
     memset(&cmd, 0, sizeof(cmd));
 
-    time_t now =  now_realtime_sec();
-
-    if (config->cleanup_after < now) {
+    if (config->cleanup_after < now_realtime_sec()) {
         cmd.opcode = ACLK_DATABASE_CLEANUP;
         aclk_database_enq_cmd(&cmd);
         config->cleanup_after += ACLK_DATABASE_CLEANUP_INTERVAL;
@@ -458,7 +456,7 @@ static void aclk_synchronization(void *arg __maybe_unused)
                     sql_unregister_node(cmd.param[0]);
 
                     break;
-// ALERTS
+                    // ALERTS
                 case ACLK_DATABASE_PUSH_ALERT_CONFIG:
                     aclk_push_alert_config_event(cmd.param[0], cmd.param[1]);
                     break;
@@ -511,20 +509,22 @@ void sql_create_aclk_table(RRDHOST *host __maybe_unused, uuid_t *host_uuid __may
 
     char sql[ACLK_SYNC_QUERY_SIZE];
 
-    snprintfz(sql, ACLK_SYNC_QUERY_SIZE-1, TABLE_ACLK_ALERT, uuid_str);
+    snprintfz(sql, sizeof(sql) - 1, TABLE_ACLK_ALERT, uuid_str);
     rc = db_execute(db_meta, sql);
     if (unlikely(rc))
         error_report("Failed to create ACLK alert table for host %s", host ? rrdhost_hostname(host) : host_guid);
     else {
-        snprintfz(sql, ACLK_SYNC_QUERY_SIZE -1, INDEX_ACLK_ALERT1, uuid_str, uuid_str);
+        snprintfz(sql, sizeof(sql) - 1, INDEX_ACLK_ALERT1, uuid_str, uuid_str);
         rc = db_execute(db_meta, sql);
         if (unlikely(rc))
-            error_report("Failed to create ACLK alert table index 1 for host %s", host ? string2str(host->hostname) : host_guid);
+            error_report(
+                "Failed to create ACLK alert table index 1 for host %s", host ? string2str(host->hostname) : host_guid);
 
-        snprintfz(sql, ACLK_SYNC_QUERY_SIZE -1, INDEX_ACLK_ALERT2, uuid_str, uuid_str);
+        snprintfz(sql, sizeof(sql) - 1, INDEX_ACLK_ALERT2, uuid_str, uuid_str);
         rc = db_execute(db_meta, sql);
         if (unlikely(rc))
-            error_report("Failed to create ACLK alert table index 2 for host %s", host ? string2str(host->hostname) : host_guid);
+            error_report(
+                "Failed to create ACLK alert table index 2 for host %s", host ? string2str(host->hostname) : host_guid);
     }
     if (likely(host) && unlikely(host->aclk_config))
         return;
@@ -560,7 +560,7 @@ void sql_create_aclk_table(RRDHOST *host __maybe_unused, uuid_t *host_uuid __may
 
 #define SQL_FETCH_ALL_INSTANCES                                                                                        \
     "SELECT ni.host_id, ni.node_id FROM host h, node_instance ni "                                                     \
-    "WHERE h.host_id = ni.host_id AND ni.node_id IS NOT NULL; "
+    "WHERE h.host_id = ni.host_id AND ni.node_id IS NOT NULL"
 
 void sql_aclk_sync_init(void)
 {