chiark / gitweb /
Revert "tree-wide: use _cleanup_(sd_bus_flush_close_unrefp) at various appropriate...
authorFranck Bui <fbui@suse.com>
Fri, 12 Jan 2018 15:09:21 +0000 (16:09 +0100)
committerSven Eden <yamakuzure@gmx.net>
Wed, 30 May 2018 05:50:04 +0000 (07:50 +0200)
This reverts commit 0b3c84eb7da3a8c28ac248a68228f6a7edbb2e19.

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

Fixes: #3543
src/login/loginctl.c

index 11bd99069859a2364373838d179bade540b96b17..2b8f4fb4728fb2fb3039e53d4acf89b310cb13eb 100644 (file)
@@ -1674,7 +1674,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, "");
@@ -1698,6 +1698,8 @@ int main(int argc, char *argv[]) {
         r = loginctl_main(argc, argv, bus);
 
 finish:
+        sd_bus_flush_close_unref(bus);
+
         pager_close();
 #if 0 /// elogind does that in elogind_cleanup()
         polkit_agent_close();