From fea7a7bff4bccba310bb14f7640ea238cd454821 Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Mon, 30 Jan 2023 16:13:27 +0200 Subject: [PATCH] lib-sql: Don't allow passing NULL duration_r to sql_query_finished_event() Almost everyone provides it in any case. --- src/lib-sql/driver-cassandra.c | 3 ++- src/lib-sql/sql-api.c | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/lib-sql/driver-cassandra.c b/src/lib-sql/driver-cassandra.c index 0f9b549ead..46b5d539c6 100644 --- a/src/lib-sql/driver-cassandra.c +++ b/src/lib-sql/driver-cassandra.c @@ -1160,6 +1160,7 @@ static void driver_cassandra_log_result(struct cassandra_result *result, { struct cassandra_db *db = container_of(result->api.db, struct cassandra_db, api); struct timeval now; + int duration ATTR_UNUSED; unsigned int row_count; i_gettimeofday(&now); @@ -1184,7 +1185,7 @@ static void driver_cassandra_log_result(struct cassandra_result *result, struct event_passthrough *e = sql_query_finished_event(&db->api, result->api.event, result->log_query, result->error == NULL, - NULL); + &duration); if (result->error != NULL) e->add_str("error", result->error); diff --git a/src/lib-sql/sql-api.c b/src/lib-sql/sql-api.c index 24c3b0db9d..3de8b45f5e 100644 --- a/src/lib-sql/sql-api.c +++ b/src/lib-sql/sql-api.c @@ -826,9 +826,7 @@ sql_query_finished_event(struct sql_db *db, struct event *event, const char *que e->add_str("slow_query", "y"); db->slow_queries++; } - - if (duration_r != NULL) - *duration_r = diff; + *duration_r = diff; return e; } -- 2.47.3