chiark / gitweb /
Remove src/resolve
[elogind.git] / src / resolve-host / resolve-host.c
index e9c0d69b0212767924bd06e5a98cb86619ddb818..068756cab1ea55c61cffa0a777e2de4ae4388093 100644 (file)
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <arpa/inet.h>
 #include <net/if.h>
 #include <getopt.h>
 
 #include "sd-bus.h"
 #include "bus-util.h"
 #include "bus-error.h"
-#include "bus-errors.h"
 #include "in-addr-util.h"
 #include "af-list.h"
 #include "build.h"
@@ -155,7 +153,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 +511,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 +610,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;
         }