X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fresolve-host%2Fresolve-host.c;h=43ecf81ef62b8e46244b6a21d017aebee98869a6;hb=10f9c75519671e7c7ab8993b54fe22da7c2d0c38;hp=e9c0d69b0212767924bd06e5a98cb86619ddb818;hpb=0a1beeb64207eaa88ab9236787b1cbc2f704ae14;p=elogind.git diff --git a/src/resolve-host/resolve-host.c b/src/resolve-host/resolve-host.c index e9c0d69b0..43ecf81ef 100644 --- a/src/resolve-host/resolve-host.c +++ b/src/resolve-host/resolve-host.c @@ -26,7 +26,7 @@ #include "sd-bus.h" #include "bus-util.h" #include "bus-error.h" -#include "bus-errors.h" +#include "bus-common-errors.h" #include "in-addr-util.h" #include "af-list.h" #include "build.h" @@ -155,7 +155,7 @@ static int resolve_host(sd_bus *bus, const char *name) { r = in_addr_to_string(family, a, &pretty); if (r < 0) { - log_error_errno(-r, "%s: failed to print address: %m", name); + log_error_errno(r, "%s: failed to print address: %m", name); continue; } @@ -513,10 +513,8 @@ static int parse_argv(int argc, char *argv[]) { case 'i': arg_ifindex = if_nametoindex(optarg); - if (arg_ifindex <= 0) { - log_error("Unknown interfaces %s: %m", optarg); - return -errno; - } + if (arg_ifindex <= 0) + return log_error_errno(errno, "Unknown interfaces %s: %m", optarg); break; case 't': @@ -614,7 +612,7 @@ int main(int argc, char **argv) { r = sd_bus_open_system(&bus); if (r < 0) { - log_error_errno(-r, "sd_bus_open_system: %m"); + log_error_errno(r, "sd_bus_open_system: %m"); goto finish; }