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

Let's shorten the code a bit.
This commit is contained in:
Lennart Poettering 2017-11-10 21:15:44 +01:00
parent d13b522751
commit 0b3c84eb7d
6 changed files with 5 additions and 13 deletions

View file

@ -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);

View file

@ -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;

View file

@ -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();

View file

@ -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();

View file

@ -1619,8 +1619,6 @@ int main(int argc, char* argv[]) {
}
finish:
bus = sd_bus_flush_close_unref(bus);
pager_close();
free(arg_mount_what);

View file

@ -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;