transaction: introduce transaction_abort_and_free()

Will be used in following commits.

diff --git a/src/core/transaction.c b/src/core/transaction.c
index 0038d541b3e1e24f6014a9cef800cd524822d93e..1c71d58c81ba57d8c14e347418a4add4d4813755 100644 (file)
--- a/src/core/transaction.c
+++ b/src/core/transaction.c
@@ -1208,3 +1208,12 @@ Transaction *transaction_free(Transaction *tr) {
 
         return mfree(tr);
 }
+
+Transaction *transaction_abort_and_free(Transaction *tr) {
+        if (!tr)
+                return NULL;
+
+        transaction_abort(tr);
+
+        return transaction_free(tr);
+}

diff --git a/src/core/transaction.h b/src/core/transaction.h
index 5258e27106d4bb75faafaa818b23c44457d8a6ba..79012d4d1d2edce5e8b3667c73d6fd1c37d27ac4 100644 (file)
--- a/src/core/transaction.h
+++ b/src/core/transaction.h
@@ -17,6 +17,8 @@ struct Transaction {
 
 Transaction *transaction_new(bool irreversible);
 Transaction *transaction_free(Transaction *tr);
+Transaction *transaction_abort_and_free(Transaction *tr);
+DEFINE_TRIVIAL_CLEANUP_FUNC(Transaction*, transaction_abort_and_free);
 
 void transaction_add_propagate_reload_jobs(Transaction *tr, Unit *unit, Job *by, bool ignore_order, sd_bus_error *e);
 int transaction_add_job_and_dependencies(