diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-05-09 09:25:03 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2018-08-24 16:47:08 +0200 |
| commit | 6f1070bd0ec0622881c815687705aabe9f0a6727 (patch) | |
| tree | da83f0596be213b38449dea7e76ba2f8ae861728 /src/libelogind/sd-bus/sd-bus.c | |
| parent | 75e479bb4fde03f84044984205b1663ac8f9d11f (diff) | |
sd-bus: trivial simplification
Diffstat (limited to 'src/libelogind/sd-bus/sd-bus.c')
| -rw-r--r-- | src/libelogind/sd-bus/sd-bus.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/libelogind/sd-bus/sd-bus.c b/src/libelogind/sd-bus/sd-bus.c index 7b32c3f88..73e10e009 100644 --- a/src/libelogind/sd-bus/sd-bus.c +++ b/src/libelogind/sd-bus/sd-bus.c @@ -278,9 +278,7 @@ _public_ int sd_bus_set_address(sd_bus *bus, const char *address) { if (!a) return -ENOMEM; - free_and_replace(bus->address, a); - - return 0; + return free_and_replace(bus->address, a); } _public_ int sd_bus_set_fd(sd_bus *bus, int input_fd, int output_fd) { @@ -1418,7 +1416,7 @@ int bus_set_address_system_remote(sd_bus *b, const char *host) { /* Let's make sure this is not a port of some kind, * and is a valid machine name. */ - if (!in_charset(m, "0123456789") && machine_name_is_valid(m)) { + if (!in_charset(m, DIGITS) && machine_name_is_valid(m)) { char *t; /* Cut out the host part */ @@ -1441,10 +1439,8 @@ int bus_set_address_system_remote(sd_bus *b, const char *host) { if (!a) return -ENOMEM; - free_and_replace(b->address, a); - - return 0; - } + return free_and_replace(b->address, a); +} _public_ int sd_bus_open_system_remote(sd_bus **ret, const char *host) { sd_bus *bus; @@ -1493,9 +1489,7 @@ int bus_set_address_system_machine(sd_bus *b, const char *machine) { if (!a) return -ENOMEM; - free_and_replace(b->address, a); - - return 0; + return free_and_replace(b->address, a); } _public_ int sd_bus_open_system_machine(sd_bus **ret, const char *machine) { |