1 files changed, 10 insertions, 29 deletions

diff --git a/src/database/sqlite/sqlite_aclk_alert.c b/src/database/sqlite/sqlite_aclk_alert.c
index e345f145bd..0433ff6a17 100644
--- a/src/database/sqlite/sqlite_aclk_alert.c
+++ b/src/database/sqlite/sqlite_aclk_alert.c
@@ -41,9 +41,7 @@ static void update_filtered(ALARM_ENTRY *ae, int64_t unique_id, char *uuid_str)
 done:
     REPORT_BIND_FAIL(res, param);
 
-    rc = sqlite3_finalize(res);
-    if (unlikely(rc != SQLITE_OK))
-        error_report("Failed to finalize statement when trying to update_filtered, rc = %d", rc);
+    SQLITE_FINALIZE(res);
 }
 
 #define SQL_SELECT_VARIABLE_ALERT_BY_UNIQUE_ID                                                                         \
@@ -75,9 +73,7 @@ static inline bool is_event_from_alert_variable_config(int64_t unique_id, uuid_t
 done:
     REPORT_BIND_FAIL(res, param);
 
-    rc = sqlite3_finalize(res);
-    if (unlikely(rc != SQLITE_OK))
-        error_report("Failed to finalize statement when trying to check for alert variables, rc = %d", rc);
+    SQLITE_FINALIZE(res);
 
     return ret;
 }
@@ -140,9 +136,7 @@ static bool should_send_to_cloud(RRDHOST *host, ALARM_ENTRY *ae)
 done:
     REPORT_BIND_FAIL(res, param);
 
-    rc = sqlite3_finalize(res);
-    if (unlikely(rc != SQLITE_OK))
-        error_report("Failed to finalize statement when trying should_send_to_cloud, rc = %d", rc);
+    SQLITE_FINALIZE(res);
 
     return send;
 }
@@ -188,8 +182,7 @@ void sql_queue_alarm_to_aclk(RRDHOST *host, ALARM_ENTRY *ae, bool skip_filter)
         error_report("Failed to store alert event %"PRIu32", rc = %d", ae->unique_id, rc);
 
 done:
-    if (unlikely(sqlite3_finalize(res_alert) != SQLITE_OK))
-        error_report("Failed to reset statement in store alert event, rc = %d", rc);
+    SQLITE_FINALIZE(res_alert);
 }
 
 int rrdcalc_status_to_proto_enum(RRDCALC_STATUS status)
@@ -412,9 +405,7 @@ static void aclk_push_alert_event(struct aclk_sync_cfg_t *wc __maybe_unused)
     }
 
 done:
-    rc = sqlite3_finalize(res);
-    if (unlikely(rc != SQLITE_OK))
-        error_report("Failed to finalize statement to send alert entries from the database, rc = %d", rc);
+    SQLITE_FINALIZE(res);
 
     freez(claim_id);
     buffer_free(sql);
@@ -482,9 +473,7 @@ void sql_queue_existing_alerts_to_aclk(RRDHOST *host)
     else
         rrdhost_flag_set(host, RRDHOST_FLAG_ACLK_STREAM_ALERTS);
 done:
-    rc = sqlite3_finalize(res);
-    if (unlikely(rc != SQLITE_OK))
-        error_report("Failed to finalize statement to queue existing alerts, rc = %d", rc);
+    SQLITE_FINALIZE(res);
 
 skip:
     rw_spinlock_write_unlock(&host->health_log.spinlock);
@@ -621,9 +610,7 @@ void aclk_push_alert_config_event(char *node_id __maybe_unused, char *config_has
         nd_log(NDLS_ACCESS, NDLP_WARNING, "ACLK STA [%s (%s)]: Alert config for %s not found.", wc->node_id, wc->host ? rrdhost_hostname(wc->host) : "N/A", config_hash);
 
 bind_fail:
-    rc = sqlite3_finalize(res);
-    if (unlikely(rc != SQLITE_OK))
-        error_report("Failed to reset statement when pushing alarm config hash, rc = %d", rc);
+    SQLITE_FINALIZE(res);
 
     freez(config_hash);
     freez(node_id);
@@ -704,9 +691,7 @@ void sql_process_queue_removed_alerts_to_aclk(char *node_id)
     }
 
 skip:
-    rc = sqlite3_finalize(res);
-    if (unlikely(rc != SQLITE_OK))
-        error_report("Failed to finalize statement to queue removed alerts, rc = %d", rc);
+    SQLITE_FINALIZE(res);
 }
 
 void sql_queue_removed_alerts_to_aclk(RRDHOST *host)
@@ -964,9 +949,7 @@ void sql_aclk_alert_clean_dead_entries(RRDHOST *host)
         error_report("Failed to execute DELETE query for cleaning stale ACLK alert entries.");
 
 skip:
-    rc = sqlite3_finalize(res);
-    if (unlikely(rc != SQLITE_OK))
-        error_report("Failed to finalize statement for cleaning stale ACLK alert entries.");
+    SQLITE_FINALIZE(res);
 }
 
 #define SQL_GET_MIN_MAX_ALERT_SEQ "SELECT MIN(sequence_id), MAX(sequence_id), " \
@@ -1001,9 +984,7 @@ int get_proto_alert_status(RRDHOST *host, struct proto_alert_status *proto_alert
             sqlite3_column_bytes(res, 2) > 0 ? (uint64_t)sqlite3_column_int64(res, 2) : 0;
     }
 
-    rc = sqlite3_finalize(res);
-    if (unlikely(rc != SQLITE_OK))
-        error_report("Failed to finalize statement to get alert log status from the database, rc = %d", rc);
+    SQLITE_FINALIZE(res);
 
     return 0;
 }