From 0ec69252ded01751f1ac086945fc9e51036a0489 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Mon, 20 May 2019 14:16:08 +0300 Subject: [PATCH] cassandra: Move cassandra_callback_run() earlier Simplifies the next commit. --- src/lib-sql/driver-cassandra.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib-sql/driver-cassandra.c b/src/lib-sql/driver-cassandra.c index 6863c7acb5..0d0359bc27 100644 --- a/src/lib-sql/driver-cassandra.c +++ b/src/lib-sql/driver-cassandra.c @@ -382,6 +382,13 @@ static void driver_cassandra_log_error(struct cassandra_db *db, e_error(db->api.event, "%s: %.*s", str, (int)size, message); } +static void cassandra_callback_run(struct cassandra_callback *cb) +{ + cb->callback(cb->future, cb->context); + cass_future_free(cb->future); + i_free(cb); +} + static void driver_cassandra_future_callback(CassFuture *future ATTR_UNUSED, void *context) { @@ -400,13 +407,6 @@ static void driver_cassandra_future_callback(CassFuture *future ATTR_UNUSED, } } -static void cassandra_callback_run(struct cassandra_callback *cb) -{ - cb->callback(cb->future, cb->context); - cass_future_free(cb->future); - i_free(cb); -} - static void driver_cassandra_input_id(struct cassandra_db *db, unsigned int id) { struct cassandra_callback *cb, *const *cbp; -- 2.47.3