From: Franck Bui <fbui@suse.com>
Date: Fri, 12 Jan 2018 15:09:21 +0000 (+0100)
Subject: Revert "tree-wide: use  _cleanup_(sd_bus_flush_close_unrefp) at various appropriate... 
X-Git-Tag: v237~113^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a3c56345735ed3154fbb218f73ef8a4a54f763b7;p=thirdparty%2Fsystemd.git

Revert "tree-wide: use  _cleanup_(sd_bus_flush_close_unrefp) at various appropriate places"

This reverts commit 0b3c84eb7da3a8c28ac248a68228f6a7edbb2e19.

The removal of _cleanup_() usages was done on purpose, see
cf647b69baee4c478d3909c327e3d917e1563f44.

Fixes: #3543
---

diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c
index 5623bb2ffab..18c65c5a34d 100644
--- a/src/busctl/busctl.c
+++ b/src/busctl/busctl.c
@@ -2017,7 +2017,7 @@ static int busctl_main(sd_bus *bus, int argc, char *argv[]) {
 }
 
 int main(int argc, char *argv[]) {
-        _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
+        sd_bus *bus = NULL;
         int r;
 
         log_parse_environment();
@@ -2113,6 +2113,7 @@ int main(int argc, char *argv[]) {
         r = busctl_main(bus, argc, argv);
 
 finish:
+        sd_bus_flush_close_unref(bus);
         pager_close();
 
         strv_free(arg_matches);
diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index f09fe42626b..421434c814c 100644
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -595,7 +595,7 @@ static int localectl_main(sd_bus *bus, int argc, char *argv[]) {
 }
 
 int main(int argc, char*argv[]) {
-        _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
+        sd_bus *bus = NULL;
         int r;
 
         setlocale(LC_ALL, "");
@@ -615,6 +615,7 @@ int main(int argc, char*argv[]) {
         r = localectl_main(bus, argc, argv);
 
 finish:
+        sd_bus_flush_close_unref(bus);
         pager_close();
 
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index dfcaff6195d..24d9facfa85 100644
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -1584,7 +1584,7 @@ static int loginctl_main(int argc, char *argv[], sd_bus *bus) {
 }
 
 int main(int argc, char *argv[]) {
-        _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
+        sd_bus *bus = NULL;
         int r;
 
         setlocale(LC_ALL, "");
@@ -1607,6 +1607,8 @@ int main(int argc, char *argv[]) {
         r = loginctl_main(argc, argv, bus);
 
 finish:
+        sd_bus_flush_close_unref(bus);
+
         pager_close();
         polkit_agent_close();
 
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 615db5afe8e..ad6efc10c4d 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -3143,7 +3143,7 @@ static int machinectl_main(int argc, char *argv[], sd_bus *bus) {
 }
 
 int main(int argc, char*argv[]) {
-        _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
+        sd_bus *bus = NULL;
         int r;
 
         setlocale(LC_ALL, "");
@@ -3166,6 +3166,7 @@ int main(int argc, char*argv[]) {
         r = machinectl_main(argc, argv, bus);
 
 finish:
+        sd_bus_flush_close_unref(bus);
         pager_close();
         polkit_agent_close();
 
diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c
index 131f160b504..0c312da8e11 100644
--- a/src/mount/mount-tool.c
+++ b/src/mount/mount-tool.c
@@ -1670,6 +1670,8 @@ int main(int argc, char* argv[]) {
         }
 
 finish:
+        bus = sd_bus_flush_close_unref(bus);
+
         pager_close();
 
         free(arg_mount_what);
diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c
index e851b4ddd16..4cc3c58ab42 100644
--- a/src/timedate/timedatectl.c
+++ b/src/timedate/timedatectl.c
@@ -473,7 +473,7 @@ static int timedatectl_main(sd_bus *bus, int argc, char *argv[]) {
 }
 
 int main(int argc, char *argv[]) {
-        _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
+        sd_bus *bus = NULL;
         int r;
 
         setlocale(LC_ALL, "");
@@ -493,6 +493,7 @@ int main(int argc, char *argv[]) {
         r = timedatectl_main(bus, argc, argv);
 
 finish:
+        sd_bus_flush_close_unref(bus);
         pager_close();
 
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;