From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Mon, 20 May 2019 11:16:08 +0000 (+0300)
Subject: cassandra: Move cassandra_callback_run() earlier
X-Git-Tag: 2.3.9~473
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ec69252ded01751f1ac086945fc9e51036a0489;p=thirdparty%2Fdovecot%2Fcore.git

cassandra: Move cassandra_callback_run() earlier

Simplifies the next commit.
---

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;