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

Let's shorten the code a bit.

diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c
index b38d6c7267aacea2e543d4c494663037702fbe75..d41ccf30feb2876a38013cd7d05c00ac86b30b43 100644 (file)
--- a/src/busctl/busctl.c
+++ b/src/busctl/busctl.c
@@ -2010,7 +2010,7 @@ static int busctl_main(sd_bus *bus, int argc, char *argv[]) {
 }
 
 int main(int argc, char *argv[]) {
-        sd_bus *bus = NULL;
+        _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
         int r;
 
         log_parse_environment();
@@ -2100,7 +2100,6 @@ 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 d9b060972d3397dfa24d954152e8d1580ed16205..2fef7d8c09d7bbfe22dc4fcb56de4bf44f605f96 100644 (file)
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -594,7 +594,7 @@ static int localectl_main(sd_bus *bus, int argc, char *argv[]) {
 }
 
 int main(int argc, char*argv[]) {
-        sd_bus *bus = NULL;
+        _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
         int r;
 
         setlocale(LC_ALL, "");
@@ -614,7 +614,6 @@ 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 f3231bc0e4eb537520cca70ec597c7a3bf7e9845..3e917cb3f57cc53e8ce1ab2e2a985787790f631d 100644 (file)
--- 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[]) {
-        sd_bus *bus = NULL;
+        _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
         int r;
 
         setlocale(LC_ALL, "");
@@ -1607,8 +1607,6 @@ 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 a44d75604aedc35b81c393efcb6c73038e3790b1..8d78a0d3c0a981b8c27154bf87f7494ef7be2681 100644 (file)
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -3046,7 +3046,7 @@ static int machinectl_main(int argc, char *argv[], sd_bus *bus) {
 }
 
 int main(int argc, char*argv[]) {
-        sd_bus *bus = NULL;
+        _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
         int r;
 
         setlocale(LC_ALL, "");
@@ -3069,7 +3069,6 @@ 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 599abf093f7f05e5d25ad9a1a0462ac6530496fb..79dab5037a2dcc28a006df713182598f3c43b1a8 100644 (file)
--- a/src/mount/mount-tool.c
+++ b/src/mount/mount-tool.c
@@ -1619,8 +1619,6 @@ 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 6fe9422f943f16feda03dd0b9c5bc3d2c1e386c4..5121dd153a4439dde8ae8ce1a96635e5de98624d 100644 (file)
--- a/src/timedate/timedatectl.c
+++ b/src/timedate/timedatectl.c
@@ -472,7 +472,7 @@ static int timedatectl_main(sd_bus *bus, int argc, char *argv[]) {
 }
 
 int main(int argc, char *argv[]) {
-        sd_bus *bus = NULL;
+        _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
         int r;
 
         setlocale(LC_ALL, "");
@@ -492,7 +492,6 @@ 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;