mirror of
https://github.com/systemd/systemd.git
synced 2024-10-28 03:25:31 +03:00
clients: various simplifications
This commit is contained in:
parent
66b1e74605
commit
84f6181c2a
@ -34,8 +34,7 @@
|
||||
#include <sys/time.h>
|
||||
#include <sys/resource.h>
|
||||
|
||||
#include <systemd/sd-messages.h>
|
||||
|
||||
#include "sd-messages.h"
|
||||
#include "unit.h"
|
||||
#include "strv.h"
|
||||
#include "conf-parser.h"
|
||||
|
@ -458,8 +458,8 @@ static int hostnamectl_main(sd_bus *bus, int argc, char *argv[]) {
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
int r;
|
||||
_cleanup_bus_unref_ sd_bus *bus = NULL;
|
||||
int r;
|
||||
|
||||
setlocale(LC_ALL, "");
|
||||
log_parse_environment();
|
||||
|
@ -794,33 +794,27 @@ static int localectl_main(sd_bus *bus, int argc, char *argv[]) {
|
||||
}
|
||||
|
||||
int main(int argc, char*argv[]) {
|
||||
int r, ret = EXIT_FAILURE;
|
||||
_cleanup_bus_unref_ sd_bus *bus = NULL;
|
||||
int r;
|
||||
|
||||
setlocale(LC_ALL, "");
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
|
||||
r = parse_argv(argc, argv);
|
||||
if (r < 0)
|
||||
if (r <= 0)
|
||||
goto finish;
|
||||
else if (r == 0) {
|
||||
ret = EXIT_SUCCESS;
|
||||
goto finish;
|
||||
}
|
||||
|
||||
r = bus_open_transport(arg_transport, arg_host, false, &bus);
|
||||
if (r < 0) {
|
||||
log_error("Failed to create bus connection: %s", strerror(-r));
|
||||
ret = EXIT_FAILURE;
|
||||
goto finish;
|
||||
}
|
||||
|
||||
r = localectl_main(bus, argc, argv);
|
||||
ret = r < 0 ? EXIT_FAILURE : r;
|
||||
|
||||
finish:
|
||||
pager_close();
|
||||
|
||||
return ret;
|
||||
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
|
||||
}
|
||||
|
@ -849,35 +849,29 @@ static int machinectl_main(sd_bus *bus, int argc, char *argv[]) {
|
||||
}
|
||||
|
||||
int main(int argc, char*argv[]) {
|
||||
int r, ret = EXIT_FAILURE;
|
||||
_cleanup_bus_unref_ sd_bus *bus = NULL;
|
||||
int r;
|
||||
|
||||
setlocale(LC_ALL, "");
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
|
||||
r = parse_argv(argc, argv);
|
||||
if (r < 0)
|
||||
if (r <= 0)
|
||||
goto finish;
|
||||
else if (r == 0) {
|
||||
ret = EXIT_SUCCESS;
|
||||
goto finish;
|
||||
}
|
||||
|
||||
r = bus_open_transport(arg_transport, arg_host, false, &bus);
|
||||
if (r < 0) {
|
||||
log_error("Failed to create bus connection: %s", strerror(-r));
|
||||
ret = EXIT_FAILURE;
|
||||
goto finish;
|
||||
}
|
||||
|
||||
r = machinectl_main(bus, argc, argv);
|
||||
ret = r < 0 ? EXIT_FAILURE : r;
|
||||
|
||||
finish:
|
||||
strv_free(arg_property);
|
||||
|
||||
pager_close();
|
||||
|
||||
return ret;
|
||||
strv_free(arg_property);
|
||||
|
||||
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
|
||||
}
|
||||
|
@ -581,33 +581,27 @@ static int timedatectl_main(sd_bus *bus, int argc, char *argv[]) {
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
int r, ret = EXIT_FAILURE;
|
||||
_cleanup_bus_unref_ sd_bus *bus = NULL;
|
||||
int r;
|
||||
|
||||
setlocale(LC_ALL, "");
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
|
||||
r = parse_argv(argc, argv);
|
||||
if (r < 0)
|
||||
if (r <= 0)
|
||||
goto finish;
|
||||
else if (r == 0) {
|
||||
ret = EXIT_SUCCESS;
|
||||
goto finish;
|
||||
}
|
||||
|
||||
r = bus_open_transport(arg_transport, arg_host, false, &bus);
|
||||
if (r < 0) {
|
||||
log_error("Failed to create bus connection: %s", strerror(-r));
|
||||
ret = EXIT_FAILURE;
|
||||
goto finish;
|
||||
}
|
||||
|
||||
r = timedatectl_main(bus, argc, argv);
|
||||
ret = r < 0 ? EXIT_FAILURE : r;
|
||||
|
||||
finish:
|
||||
pager_close();
|
||||
|
||||
return ret;
|
||||
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user