treewide: no need to negate errno for log_*_errno()

It corrrectly handles both positive and negative errno values.

src/ac-power/ac-power.c

@@ -29,7 +29,7 @@ int main(int argc, char *argv[]) {
 
         r = on_ac_power();
         if (r < 0) {
-                log_error_errno(-r, "Failed to read AC status: %m");
+                log_error_errno(r, "Failed to read AC status: %m");
                 return EXIT_FAILURE;
         }
 

src/activate/activate.c

@@ -103,7 +103,7 @@ static int open_sockets(int *epoll_fd, bool accept) {
                 fd = make_socket_fd(LOG_DEBUG, *address, SOCK_STREAM | (arg_accept*SOCK_CLOEXEC));
                 if (fd < 0) {
                         log_open();
-                        log_error_errno(-fd, "Failed to open '%s': %m", *address);
+                        log_error_errno(fd, "Failed to open '%s': %m", *address);
                         return fd;
                 }
 

src/analyze/analyze-verify.c

@@ -222,7 +222,7 @@ int verify_units(char **filenames, SystemdRunningAs running_as, bool check_man)
         /* set the path */
         r = generate_path(&var, filenames);
         if (r < 0) {
-                log_error_errno(-r, "Failed to generate unit load path: %m");
+                log_error_errno(r, "Failed to generate unit load path: %m");
                 return r;
         }
 
@@ -230,7 +230,7 @@ int verify_units(char **filenames, SystemdRunningAs running_as, bool check_man)
 
         r = manager_new(running_as, true, &m);
         if (r < 0) {
-                log_error_errno(-r, "Failed to initalize manager: %m");
+                log_error_errno(r, "Failed to initalize manager: %m");
                 return r;
         }
 
@@ -238,7 +238,7 @@ int verify_units(char **filenames, SystemdRunningAs running_as, bool check_man)
 
         r = manager_startup(m, serial, fdset);
         if (r < 0) {
-                log_error_errno(-r, "Failed to start manager: %m");
+                log_error_errno(r, "Failed to start manager: %m");
                 goto finish;
         }
 
@@ -260,7 +260,7 @@ int verify_units(char **filenames, SystemdRunningAs running_as, bool check_man)
                 } else
                         k = manager_load_unit(m, NULL, *filename, &err, &units[count]);
                 if (k < 0) {
-                        log_error_errno(-k, "Failed to load %s: %m", *filename);
+                        log_error_errno(k, "Failed to load %s: %m", *filename);
                         if (r == 0)
                                 r = k;
                 } else

src/analyze/analyze.c

@@ -1362,7 +1362,7 @@ int main(int argc, char *argv[]) {
 
                 r = bus_open_transport_systemd(arg_transport, arg_host, arg_user, &bus);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to create bus connection: %m");
+                        log_error_errno(r, "Failed to create bus connection: %m");
                         goto finish;
                 }
 

src/backlight/backlight.c

@@ -211,7 +211,7 @@ static unsigned get_max_brightness(struct udev_device *device) {
 
         r = safe_atou(max_brightness_str, &max_brightness);
         if (r < 0) {
-                log_warning_errno(-r, "Failed to parse 'max_brightness' \"%s\": %m", max_brightness_str);
+                log_warning_errno(r, "Failed to parse 'max_brightness' \"%s\": %m", max_brightness_str);
                 return 0;
         }
 
@@ -235,7 +235,7 @@ static void clamp_brightness(struct udev_device *device, char **value, unsigned
 
         r = safe_atou(*value, &brightness);
         if (r < 0) {
-                log_warning_errno(-r, "Failed to parse brightness \"%s\": %m", *value);
+                log_warning_errno(r, "Failed to parse brightness \"%s\": %m", *value);
                 return;
         }
 
@@ -387,7 +387,7 @@ int main(int argc, char *argv[]) {
                         if (r == -ENOENT)
                                 return EXIT_SUCCESS;
 
-                        log_error_errno(-r, "Failed to read %s: %m", saved);
+                        log_error_errno(r, "Failed to read %s: %m", saved);
                         return EXIT_FAILURE;
                 }
 
@@ -416,7 +416,7 @@ int main(int argc, char *argv[]) {
 
                 r = write_string_file(saved, value);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to write %s: %m", saved);
+                        log_error_errno(r, "Failed to write %s: %m", saved);
                         return EXIT_FAILURE;
                 }
 

src/binfmt/binfmt.c

@@ -65,7 +65,7 @@ static int apply_rule(const char *rule) {
 
         r = write_string_file("/proc/sys/fs/binfmt_misc/register", rule);
         if (r < 0) {
-                log_error_errno(-r, "Failed to add binary format: %m");
+                log_error_errno(r, "Failed to add binary format: %m");
                 return r;
         }
 
@@ -83,7 +83,7 @@ static int apply_file(const char *path, bool ignore_enoent) {
                 if (ignore_enoent && r == -ENOENT)
                         return 0;
 
-                log_error_errno(-r, "Failed to open file '%s', ignoring: %m", path);
+                log_error_errno(r, "Failed to open file '%s', ignoring: %m", path);
                 return r;
         }
 
@@ -191,7 +191,7 @@ int main(int argc, char *argv[]) {
 
                 r = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to enumerate binfmt.d files: %m");
+                        log_error_errno(r, "Failed to enumerate binfmt.d files: %m");
                         goto finish;
                 }
 

src/bootchart/bootchart.c

@@ -290,7 +290,7 @@ static void do_journal_append(char *file) {
         }
         n = loop_read(f, p + 10, BOOTCHART_MAX, false);
         if (n < 0) {
-                log_error_errno(-n, "Failed to read bootchart data: %m");
+                log_error_errno(n, "Failed to read bootchart data: %m");
                 close(f);
                 return;
         }
@@ -302,7 +302,7 @@ static void do_journal_append(char *file) {
 
         r = sd_journal_sendv(iovec, j);
         if (r < 0)
-                log_error_errno(-r, "Failed to send bootchart: %m");
+                log_error_errno(r, "Failed to send bootchart: %m");
 }
 
 int main(int argc, char *argv[]) {

src/bus-proxyd/bus-policy.c

@@ -95,7 +95,7 @@ static int file_load(Policy *p, const char *path) {
                 if (r == -EISDIR)
                         return r;
 
-                log_error_errno(-r, "Failed to load %s: %m", path);
+                log_error_errno(r, "Failed to load %s: %m", path);
                 return r;
         }
 
@@ -106,7 +106,7 @@ static int file_load(Policy *p, const char *path) {
 
                 t = xml_tokenize(&q, &name, &xml_state, &line);
                 if (t < 0) {
-                        log_error_errno(-t, "XML parse failure in %s: %m", path);
+                        log_error_errno(t, "XML parse failure in %s: %m", path);
                         return t;
                 }
 
@@ -358,7 +358,7 @@ static int file_load(Policy *p, const char *path) {
 
                                         r = get_user_creds(&u, &i->uid, NULL, NULL, NULL);
                                         if (r < 0) {
-                                                log_error_errno(-r, "Failed to resolve user %s, ignoring policy: %m", u);
+                                                log_error_errno(r, "Failed to resolve user %s, ignoring policy: %m", u);
                                                 free(i);
                                         } else {
                                                 PolicyItem *first;
@@ -390,7 +390,7 @@ static int file_load(Policy *p, const char *path) {
 
                                         r = get_group_creds(&g, &i->gid);
                                         if (r < 0) {
-                                                log_error_errno(-r, "Failed to resolve group %s, ignoring policy: %m", g);
+                                                log_error_errno(r, "Failed to resolve group %s, ignoring policy: %m", g);
                                                 free(i);
                                         } else {
                                                 PolicyItem *first;
@@ -533,7 +533,7 @@ static int file_load(Policy *p, const char *path) {
 
                                                 r = get_user_creds(&u, &i->uid, NULL, NULL, NULL);
                                                 if (r < 0)
-                                                        log_error_errno(-r, "Failed to resolve user %s: %m", name);
+                                                        log_error_errno(r, "Failed to resolve user %s: %m", name);
                                                 else
                                                         i->uid_valid = true;
                                         }
@@ -544,7 +544,7 @@ static int file_load(Policy *p, const char *path) {
 
                                                 r = get_group_creds(&g, &i->gid);
                                                 if (r < 0)
-                                                        log_error_errno(-r, "Failed to resolve group %s: %m", name);
+                                                        log_error_errno(r, "Failed to resolve group %s: %m", name);
                                                 else
                                                         i->gid_valid = true;
                                         }
@@ -895,7 +895,7 @@ int policy_load(Policy *p, char **files) {
 
                         r = conf_files_list(&l, ".conf", NULL, *i, NULL);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to get configuration file list: %m");
+                                log_error_errno(r, "Failed to get configuration file list: %m");
                                 return r;
                         }
 

src/bus-proxyd/bus-proxyd.c

@@ -1160,31 +1160,31 @@ static int process_hello(sd_bus *a, sd_bus *b, sd_bus_message *m, bool *got_hell
 
         r = sd_bus_message_new_method_return(m, &n);
         if (r < 0) {
-                log_error_errno(-r, "Failed to generate HELLO reply: %m");
+                log_error_errno(r, "Failed to generate HELLO reply: %m");
                 return r;
         }
 
         r = sd_bus_message_append(n, "s", a->unique_name);
         if (r < 0) {
-                log_error_errno(-r, "Failed to append unique name to HELLO reply: %m");
+                log_error_errno(r, "Failed to append unique name to HELLO reply: %m");
                 return r;
         }
 
         r = bus_message_append_sender(n, "org.freedesktop.DBus");
         if (r < 0) {
-                log_error_errno(-r, "Failed to append sender to HELLO reply: %m");
+                log_error_errno(r, "Failed to append sender to HELLO reply: %m");
                 return r;
         }
 
         r = bus_seal_synthetic_message(b, n);
         if (r < 0) {
-                log_error_errno(-r, "Failed to seal HELLO reply: %m");
+                log_error_errno(r, "Failed to seal HELLO reply: %m");
                 return r;
         }
 
         r = sd_bus_send(b, n, NULL);
         if (r < 0) {
-                log_error_errno(-r, "Failed to send HELLO reply: %m");
+                log_error_errno(r, "Failed to send HELLO reply: %m");
                 return r;
         }
 
@@ -1196,31 +1196,31 @@ static int process_hello(sd_bus *a, sd_bus *b, sd_bus_message *m, bool *got_hell
                         "org.freedesktop.DBus",
                         "NameAcquired");
         if (r < 0) {
-                log_error_errno(-r, "Failed to allocate initial NameAcquired message: %m");
+                log_error_errno(r, "Failed to allocate initial NameAcquired message: %m");
                 return r;
         }
 
         r = sd_bus_message_append(n, "s", a->unique_name);
         if (r < 0) {
-                log_error_errno(-r, "Failed to append unique name to NameAcquired message: %m");
+                log_error_errno(r, "Failed to append unique name to NameAcquired message: %m");
                 return r;
         }
 
         r = bus_message_append_sender(n, "org.freedesktop.DBus");
         if (r < 0) {
-                log_error_errno(-r, "Failed to append sender to NameAcquired message: %m");
+                log_error_errno(r, "Failed to append sender to NameAcquired message: %m");
                 return r;
         }
 
         r = bus_seal_synthetic_message(b, n);
         if (r < 0) {
-                log_error_errno(-r, "Failed to seal NameAcquired message: %m");
+                log_error_errno(r, "Failed to seal NameAcquired message: %m");
                 return r;
         }
 
         r = sd_bus_send(b, n, NULL);
         if (r < 0) {
-                log_error_errno(-r, "Failed to send NameAcquired message: %m");
+                log_error_errno(r, "Failed to send NameAcquired message: %m");
                 return r;
         }
 
@@ -1305,7 +1305,7 @@ int main(int argc, char *argv[]) {
 
                 r = get_user_creds(&user, &uid, &gid, NULL, NULL);
                 if (r < 0) {
-                        log_error_errno(-r, "Cannot resolve user name %s: %m", user);
+                        log_error_errno(r, "Cannot resolve user name %s: %m", user);
                         goto finish;
                 }
 
@@ -1322,31 +1322,31 @@ int main(int argc, char *argv[]) {
 
         r = sd_bus_new(&a);
         if (r < 0) {
-                log_error_errno(-r, "Failed to allocate bus: %m");
+                log_error_errno(r, "Failed to allocate bus: %m");
                 goto finish;
         }
 
         r = sd_bus_set_description(a, "sd-proxy");
         if (r < 0) {
-                log_error_errno(-r, "Failed to set bus name: %m");
+                log_error_errno(r, "Failed to set bus name: %m");
                 goto finish;
         }
 
         r = sd_bus_set_address(a, arg_address);
         if (r < 0) {
-                log_error_errno(-r, "Failed to set address to connect to: %m");
+                log_error_errno(r, "Failed to set address to connect to: %m");
                 goto finish;
         }
 
         r = sd_bus_negotiate_fds(a, is_unix);
         if (r < 0) {
-                log_error_errno(-r, "Failed to set FD negotiation: %m");
+                log_error_errno(r, "Failed to set FD negotiation: %m");
                 goto finish;
         }
 
         r = sd_bus_negotiate_creds(a, true, SD_BUS_CREDS_UID|SD_BUS_CREDS_PID|SD_BUS_CREDS_GID|SD_BUS_CREDS_SELINUX_CONTEXT);
         if (r < 0) {
-                log_error_errno(-r, "Failed to set credential negotiation: %m");
+                log_error_errno(r, "Failed to set credential negotiation: %m");
                 goto finish;
         }
 
@@ -1374,13 +1374,13 @@ int main(int argc, char *argv[]) {
 
         r = sd_bus_start(a);
         if (r < 0) {
-                log_error_errno(-r, "Failed to start bus client: %m");
+                log_error_errno(r, "Failed to start bus client: %m");
                 goto finish;
         }
 
         r = sd_bus_get_owner_id(a, &server_id);
         if (r < 0) {
-                log_error_errno(-r, "Failed to get server ID: %m");
+                log_error_errno(r, "Failed to get server ID: %m");
                 goto finish;
         }
 
@@ -1390,13 +1390,13 @@ int main(int argc, char *argv[]) {
 
                 r = sd_bus_get_owner_creds(a, SD_BUS_CREDS_UID, &bus_creds);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to get bus creds: %m");
+                        log_error_errno(r, "Failed to get bus creds: %m");
                         goto finish;
                 }
 
                 r = sd_bus_creds_get_uid(bus_creds, &bus_uid);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to get bus owner UID: %m");
+                        log_error_errno(r, "Failed to get bus owner UID: %m");
                         goto finish;
                 }
 
@@ -1406,7 +1406,7 @@ int main(int argc, char *argv[]) {
 
                         r = policy_load(&policy_buffer, arg_configuration);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to load policy: %m");
+                                log_error_errno(r, "Failed to load policy: %m");
                                 goto finish;
                         }
 
@@ -1423,37 +1423,37 @@ int main(int argc, char *argv[]) {
 
         r = sd_bus_new(&b);
         if (r < 0) {
-                log_error_errno(-r, "Failed to allocate bus: %m");
+                log_error_errno(r, "Failed to allocate bus: %m");
                 goto finish;
         }
 
         r = sd_bus_set_fd(b, in_fd, out_fd);
         if (r < 0) {
-                log_error_errno(-r, "Failed to set fds: %m");
+                log_error_errno(r, "Failed to set fds: %m");
                 goto finish;
         }
 
         r = sd_bus_set_server(b, 1, server_id);
         if (r < 0) {
-                log_error_errno(-r, "Failed to set server mode: %m");
+                log_error_errno(r, "Failed to set server mode: %m");
                 goto finish;
         }
 
         r = sd_bus_negotiate_fds(b, is_unix);
         if (r < 0) {
-                log_error_errno(-r, "Failed to set FD negotiation: %m");
+                log_error_errno(r, "Failed to set FD negotiation: %m");
                 goto finish;
         }
 
         r = sd_bus_negotiate_creds(b, true, SD_BUS_CREDS_UID|SD_BUS_CREDS_PID|SD_BUS_CREDS_GID|SD_BUS_CREDS_SELINUX_CONTEXT);
         if (r < 0) {
-                log_error_errno(-r, "Failed to set credential negotiation: %m");
+                log_error_errno(r, "Failed to set credential negotiation: %m");
                 goto finish;
         }
 
         r = sd_bus_set_anonymous(b, true);
         if (r < 0) {
-                log_error_errno(-r, "Failed to set anonymous authentication: %m");
+                log_error_errno(r, "Failed to set anonymous authentication: %m");
                 goto finish;
         }
 
@@ -1461,13 +1461,13 @@ int main(int argc, char *argv[]) {
 
         r = sd_bus_start(b);
         if (r < 0) {
-                log_error_errno(-r, "Failed to start bus client: %m");
+                log_error_errno(r, "Failed to start bus client: %m");
                 goto finish;
         }
 
         r = rename_service(a, b);
         if (r < 0)
-                log_debug_errno(-r, "Failed to rename process: %m");
+                log_debug_errno(r, "Failed to rename process: %m");
 
         if (a->is_kernel) {
                 _cleanup_free_ char *match = NULL;
@@ -1475,7 +1475,7 @@ int main(int argc, char *argv[]) {
 
                 r = sd_bus_get_unique_name(a, &unique);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to get unique name: %m");
+                        log_error_errno(r, "Failed to get unique name: %m");
                         goto finish;
                 }
 
@@ -1495,7 +1495,7 @@ int main(int argc, char *argv[]) {
 
                 r = sd_bus_add_match(a, NULL, match, NULL, NULL);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to add match for NameLost: %m");
+                        log_error_errno(r, "Failed to add match for NameLost: %m");
                         goto finish;
                 }
 
@@ -1516,7 +1516,7 @@ int main(int argc, char *argv[]) {
 
                 r = sd_bus_add_match(a, NULL, match, NULL, NULL);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to add match for NameAcquired: %m");
+                        log_error_errno(r, "Failed to add match for NameAcquired: %m");
                         goto finish;
                 }
         }
@@ -1538,7 +1538,7 @@ int main(int argc, char *argv[]) {
                                 if (r == -ECONNRESET)
                                         r = 0;
                                 else
-                                        log_error_errno(-r, "Failed to process bus a: %m");
+                                        log_error_errno(r, "Failed to process bus a: %m");
 
                                 goto finish;
                         }
@@ -1555,7 +1555,7 @@ int main(int argc, char *argv[]) {
                                 k = synthesize_name_acquired(a, b, m);
                                 if (k < 0) {
                                         r = k;
-                                        log_error_errno(-r, "Failed to synthesize message: %m");
+                                        log_error_errno(r, "Failed to synthesize message: %m");
                                         goto finish;
                                 }
 
@@ -1565,7 +1565,7 @@ int main(int argc, char *argv[]) {
                                         k = process_policy(a, b, m, policy, &ucred, owned_names);
                                         if (k < 0) {
                                                 r = k;
-                                                log_error_errno(-r, "Failed to process policy: %m");
+                                                log_error_errno(r, "Failed to process policy: %m");
                                                 goto finish;
                                         } else if (k > 0) {
                                                 r = 1;
@@ -1580,7 +1580,7 @@ int main(int argc, char *argv[]) {
                                                         r = 0;
                                                 else {
                                                         r = k;
-                                                        log_error_errno(-r, "Failed to send message to client: %m");
+                                                        log_error_errno(r, "Failed to send message to client: %m");
                                                 }
 
                                                 goto finish;
@@ -1600,7 +1600,7 @@ int main(int argc, char *argv[]) {
                         if (r == -ECONNRESET)
                                 r = 0;
                         else
-                                log_error_errno(-r, "Failed to process bus b: %m");
+                                log_error_errno(r, "Failed to process bus b: %m");
 
                         goto finish;
                 }
@@ -1617,7 +1617,7 @@ int main(int argc, char *argv[]) {
                         k = process_hello(a, b, m, &got_hello);
                         if (k < 0) {
                                 r = k;
-                                log_error_errno(-r, "Failed to process HELLO: %m");
+                                log_error_errno(r, "Failed to process HELLO: %m");
                                 goto finish;
                         } else if (k > 0) {
                                 processed = true;
@@ -1628,7 +1628,7 @@ int main(int argc, char *argv[]) {
                                 k = process_driver(a, b, m, policy, &ucred, owned_names);
                                 if (k < 0) {
                                         r = k;
-                                        log_error_errno(-r, "Failed to process driver calls: %m");
+                                        log_error_errno(r, "Failed to process driver calls: %m");
                                         goto finish;
                                 } else if (k > 0) {
                                         processed = true;
@@ -1642,7 +1642,7 @@ int main(int argc, char *argv[]) {
                                                         k = process_policy(b, a, m, policy, &ucred, owned_names);
                                                         if (k < 0) {
                                                                 r = k;
-                                                                log_error_errno(-r, "Failed to process policy: %m");
+                                                                log_error_errno(r, "Failed to process policy: %m");
                                                                 goto finish;
                                                         } else if (k > 0) {
                                                                 processed = true;
@@ -1660,7 +1660,7 @@ int main(int argc, char *argv[]) {
                                                                 r = 0;
                                                         else {
                                                                 r = k;
-                                                                log_error_errno(-r, "Failed to send message to bus: %m");
+                                                                log_error_errno(r, "Failed to send message to bus: %m");
                                                         }
 
                                                         goto finish;
@@ -1678,31 +1678,31 @@ int main(int argc, char *argv[]) {
 
                 fd = sd_bus_get_fd(a);
                 if (fd < 0) {
-                        log_error_errno(-r, "Failed to get fd: %m");
+                        log_error_errno(r, "Failed to get fd: %m");
                         goto finish;
                 }
 
                 events_a = sd_bus_get_events(a);
                 if (events_a < 0) {
-                        log_error_errno(-r, "Failed to get events mask: %m");
+                        log_error_errno(r, "Failed to get events mask: %m");
                         goto finish;
                 }
 
                 r = sd_bus_get_timeout(a, &timeout_a);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to get timeout: %m");
+                        log_error_errno(r, "Failed to get timeout: %m");
                         goto finish;
                 }
 
                 events_b = sd_bus_get_events(b);
                 if (events_b < 0) {
-                        log_error_errno(-r, "Failed to get events mask: %m");
+                        log_error_errno(r, "Failed to get events mask: %m");
                         goto finish;
                 }
 
                 r = sd_bus_get_timeout(b, &timeout_b);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to get timeout: %m");
+                        log_error_errno(r, "Failed to get timeout: %m");
                         goto finish;
                 }
 

src/cgls/cgls.c

@@ -155,7 +155,7 @@ int main(int argc, char *argv[]) {
 
         r = bus_open_transport(BUS_TRANSPORT_LOCAL, NULL, false, &bus);
         if (r < 0) {
-                log_error_errno(-r, "Failed to create bus connection: %m");
+                log_error_errno(r, "Failed to create bus connection: %m");
                 goto finish;
         }
 
@@ -206,7 +206,7 @@ int main(int argc, char *argv[]) {
                                 m = strappenda("/run/systemd/machines/", arg_machine);
                                 r = parse_env_file(m, NEWLINE, "SCOPE", &scope, NULL);
                                 if (r < 0) {
-                                        log_error_errno(-r, "Failed to get machine path: %m");
+                                        log_error_errno(r, "Failed to get machine path: %m");
                                         goto finish;
                                 }
 
@@ -257,7 +257,7 @@ int main(int argc, char *argv[]) {
         }
 
         if (r < 0) {
-                log_error_errno(-r, "Failed to list cgroup tree %s: %m", root);
+                log_error_errno(r, "Failed to list cgroup tree %s: %m", root);
                 retval = EXIT_FAILURE;
         } else
                 retval = EXIT_SUCCESS;

src/cgroups-agent/cgroups-agent.c

@@ -48,7 +48,7 @@ int main(int argc, char *argv[]) {
                 /* If we couldn't connect we assume this was triggered
                  * while systemd got restarted/transitioned from
                  * initrd to the system, so let's ignore this */
-                log_debug_errno(-r, "Failed to get D-Bus connection: %m");
+                log_debug_errno(r, "Failed to get D-Bus connection: %m");
                 return EXIT_FAILURE;
         }
 
@@ -58,7 +58,7 @@ int main(int argc, char *argv[]) {
                                "Released",
                                "s", argv[1]);
         if (r < 0) {
-                log_debug_errno(-r, "Failed to send signal message on private connection: %m");
+                log_debug_errno(r, "Failed to send signal message on private connection: %m");
                 return EXIT_FAILURE;
         }
 

src/cgtop/cgtop.c

@@ -748,7 +748,7 @@ int main(int argc, char *argv[]) {
                         if (r == -ETIMEDOUT)
                                 continue;
                         if (r < 0) {
-                                log_error_errno(-r, "Couldn't read key: %m");
+                                log_error_errno(r, "Couldn't read key: %m");
                                 goto finish;
                         }
                 }
@@ -842,7 +842,7 @@ finish:
         group_hashmap_free(b);
 
         if (r < 0) {
-                log_error_errno(-r, "Exiting with failure: %m");
+                log_error_errno(r, "Exiting with failure: %m");
                 return EXIT_FAILURE;
         }
 

src/console/consoled-session.c

@@ -231,7 +231,7 @@ void session_dirty(Session *s) {
 
         r = sd_event_source_set_enabled(s->redraw_src, SD_EVENT_ONESHOT);
         if (r < 0)
-                log_error_errno(-r, "Cannot enable redraw-source: %m");
+                log_error_errno(r, "Cannot enable redraw-source: %m");
 }
 
 void session_add_device(Session *s, sysview_device *device) {

src/console/consoled-terminal.c

@@ -52,7 +52,7 @@ static int terminal_pty_fn(Pty *pty, void *userdata, unsigned int event, const v
         case PTY_DATA:
                 r = term_screen_feed_text(t->screen, ptr, size);
                 if (r < 0)
-                        log_error_errno(-r, "Cannot update screen state: %m");
+                        log_error_errno(r, "Cannot update screen state: %m");
 
                 workspace_dirty(t->workspace);
                 break;
@@ -128,12 +128,12 @@ void terminal_resize(Terminal *t) {
         if (t->pty) {
                 r = pty_resize(t->pty, width, height);
                 if (r < 0)
-                        log_error_errno(-r, "Cannot resize pty: %m");
+                        log_error_errno(r, "Cannot resize pty: %m");
         }
 
         r = term_screen_resize(t->screen, width, height);
         if (r < 0)
-                log_error_errno(-r, "Cannot resize screen: %m");
+                log_error_errno(r, "Cannot resize screen: %m");
 }
 
 void terminal_run(Terminal *t) {
@@ -151,7 +151,7 @@ void terminal_run(Terminal *t) {
                        term_screen_get_width(t->screen),
                        term_screen_get_height(t->screen));
         if (pid < 0) {
-                log_error_errno(-pid, "Cannot fork PTY: %m");
+                log_error_errno(pid, "Cannot fork PTY: %m");
                 return;
         } else if (pid == 0) {
                 /* child */

src/console/consoled.c

@@ -45,7 +45,7 @@ int main(int argc, char *argv[]) {
 
         r = manager_new(&m);
         if (r < 0) {
-                log_error_errno(-r, "Could not create manager: %m");
+                log_error_errno(r, "Could not create manager: %m");
                 goto out;
         }
 
@@ -55,7 +55,7 @@ int main(int argc, char *argv[]) {
 
         r = manager_run(m);
         if (r < 0) {
-                log_error_errno(-r, "Cannot run manager: %m");
+                log_error_errno(r, "Cannot run manager: %m");
                 goto out;
         }
 

src/core/busname.c

@@ -409,7 +409,7 @@ static int busname_make_starter(BusName *n, pid_t *_pid) {
 
         fail_child:
                 log_open();
-                log_error_errno(-r, "Failed to create starter connection at step %s: %m", exit_status_to_string(ret, EXIT_STATUS_SYSTEMD));
+                log_error_errno(r, "Failed to create starter connection at step %s: %m", exit_status_to_string(ret, EXIT_STATUS_SYSTEMD));
 
                 _exit(ret);
         }

src/core/cgroup.c

@@ -631,7 +631,7 @@ static int unit_create_cgroups(Unit *u, CGroupControllerMask mask) {
         /* First, create our own group */
         r = cg_create_everywhere(u->manager->cgroup_supported, mask, u->cgroup_path);
         if (r < 0) {
-                log_error_errno(-r, "Failed to create cgroup %s: %m", u->cgroup_path);
+                log_error_errno(r, "Failed to create cgroup %s: %m", u->cgroup_path);
                 return r;
         }
 
@@ -642,7 +642,7 @@ static int unit_create_cgroups(Unit *u, CGroupControllerMask mask) {
         /* Then, possibly move things over */
         r = cg_migrate_everywhere(u->manager->cgroup_supported, u->cgroup_path, u->cgroup_path, migrate_callback, u);
         if (r < 0)
-                log_warning_errno(-r, "Failed to migrate cgroup from to %s: %m", u->cgroup_path);
+                log_warning_errno(r, "Failed to migrate cgroup from to %s: %m", u->cgroup_path);
 
         return 0;
 }
@@ -715,7 +715,7 @@ unsigned manager_dispatch_cgroup_queue(Manager *m) {
 
                 r = unit_realize_cgroup_now(i, state);
                 if (r < 0)
-                        log_warning_errno(-r, "Failed to realize cgroups for queued unit %s: %m", i->id);
+                        log_warning_errno(r, "Failed to realize cgroups for queued unit %s: %m", i->id);
 
                 n++;
         }
@@ -798,7 +798,7 @@ void unit_destroy_cgroup(Unit *u) {
 
         r = cg_trim_everywhere(u->manager->cgroup_supported, u->cgroup_path, !unit_has_name(u, SPECIAL_ROOT_SLICE));
         if (r < 0)
-                log_debug_errno(-r, "Failed to destroy cgroup %s: %m", u->cgroup_path);
+                log_debug_errno(r, "Failed to destroy cgroup %s: %m", u->cgroup_path);
 
         hashmap_remove(u->manager->cgroup_unit, u->cgroup_path);
 
@@ -858,7 +858,7 @@ int manager_setup_cgroup(Manager *m) {
 
         r = cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER, 0, &m->cgroup_root);
         if (r < 0) {
-                log_error_errno(-r, "Cannot determine cgroup we are running in: %m");
+                log_error_errno(r, "Cannot determine cgroup we are running in: %m");
                 return r;
         }
 
@@ -884,7 +884,7 @@ int manager_setup_cgroup(Manager *m) {
         /* 2. Show data */
         r = cg_get_path(SYSTEMD_CGROUP_CONTROLLER, m->cgroup_root, NULL, &path);
         if (r < 0) {
-                log_error_errno(-r, "Cannot find cgroup mount point: %m");
+                log_error_errno(r, "Cannot find cgroup mount point: %m");
                 return r;
         }
 
@@ -895,7 +895,7 @@ int manager_setup_cgroup(Manager *m) {
                 if (m->running_as == SYSTEMD_SYSTEM) {
                         r = cg_install_release_agent(SYSTEMD_CGROUP_CONTROLLER, SYSTEMD_CGROUP_AGENT_PATH);
                         if (r < 0)
-                                log_warning_errno(-r, "Failed to install release agent, ignoring: %m");
+                                log_warning_errno(r, "Failed to install release agent, ignoring: %m");
                         else if (r > 0)
                                 log_debug("Installed release agent.");
                         else
@@ -905,7 +905,7 @@ int manager_setup_cgroup(Manager *m) {
                 /* 4. Make sure we are in the root cgroup */
                 r = cg_create_and_attach(SYSTEMD_CGROUP_CONTROLLER, m->cgroup_root, 0);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to create root cgroup hierarchy: %m");
+                        log_error_errno(r, "Failed to create root cgroup hierarchy: %m");
                         return r;
                 }
 

src/core/dbus-job.c

@@ -154,7 +154,7 @@ void bus_job_send_change_signal(Job *j) {
 
         r = bus_foreach_bus(j->manager, j->clients, j->sent_dbus_new_signal ? send_changed_signal : send_new_signal, j);
         if (r < 0)
-                log_debug_errno(-r, "Failed to send job change signal for %u: %m", j->id);
+                log_debug_errno(r, "Failed to send job change signal for %u: %m", j->id);
 
         j->sent_dbus_new_signal = true;
 }
@@ -198,5 +198,5 @@ void bus_job_send_removed_signal(Job *j) {
 
         r = bus_foreach_bus(j->manager, j->clients, send_removed_signal, j);
         if (r < 0)
-                log_debug_errno(-r, "Failed to send job remove signal for %u: %m", j->id);
+                log_debug_errno(r, "Failed to send job remove signal for %u: %m", j->id);
 }

src/core/dbus-manager.c

@@ -1514,7 +1514,7 @@ static int reply_unit_file_changes_and_free(
         if (n_changes > 0) {
                 r = bus_foreach_bus(m, NULL, send_unit_files_changed, NULL);
                 if (r < 0)
-                        log_debug_errno(-r, "Failed to send UnitFilesChanged signal: %m");
+                        log_debug_errno(r, "Failed to send UnitFilesChanged signal: %m");
         }
 
         r = sd_bus_message_new_method_return(message, &reply);
@@ -1998,7 +1998,7 @@ void bus_manager_send_finished(
                                 total_usec
                         });
         if (r < 0)
-                log_debug_errno(-r, "Failed to send finished signal: %m");
+                log_debug_errno(r, "Failed to send finished signal: %m");
 }
 
 static int send_reloading(sd_bus *bus, void *userdata) {
@@ -2025,6 +2025,6 @@ void bus_manager_send_reloading(Manager *m, bool active) {
 
         r = bus_foreach_bus(m, NULL, send_reloading, INT_TO_PTR(active));
         if (r < 0)
-                log_debug_errno(-r, "Failed to send reloading signal: %m");
+                log_debug_errno(r, "Failed to send reloading signal: %m");
 
 }

src/core/dbus-unit.c

@@ -693,7 +693,7 @@ void bus_unit_send_change_signal(Unit *u) {
 
         r = bus_foreach_bus(u->manager, NULL, u->sent_dbus_new_signal ? send_changed_signal : send_new_signal, u);
         if (r < 0)
-                log_debug_errno(-r, "Failed to send unit change signal for %s: %m", u->id);
+                log_debug_errno(r, "Failed to send unit change signal for %s: %m", u->id);
 
         u->sent_dbus_new_signal = true;
 }
@@ -739,7 +739,7 @@ void bus_unit_send_removed_signal(Unit *u) {
 
         r = bus_foreach_bus(u->manager, NULL, send_removed_signal, u);
         if (r < 0)
-                log_debug_errno(-r, "Failed to send unit remove signal for %s: %m", u->id);
+                log_debug_errno(r, "Failed to send unit remove signal for %s: %m", u->id);
 }
 
 int bus_unit_queue_job(

src/core/dbus.c

@@ -64,7 +64,7 @@ int bus_send_queued_message(Manager *m) {
 
         r = sd_bus_send(m->queued_message_bus, m->queued_message, NULL);
         if (r < 0)
-                log_warning_errno(-r, "Failed to send queued message: %m");
+                log_warning_errno(r, "Failed to send queued message: %m");
 
         m->queued_message = sd_bus_message_unref(m->queued_message);
         m->queued_message_bus = sd_bus_unref(m->queued_message_bus);
@@ -95,7 +95,7 @@ static int signal_agent_released(sd_bus *bus, sd_bus_message *message, void *use
 
                 r = sd_bus_send(m->system_bus, message, NULL);
                 if (r < 0)
-                        log_warning_errno(-r, "Failed to forward Released message: %m");
+                        log_warning_errno(r, "Failed to forward Released message: %m");
         }
 
         return 0;
@@ -203,7 +203,7 @@ failed:
 
         r = sd_bus_send_to(bus, reply, "org.freedesktop.DBus", NULL);
         if (r < 0) {
-                log_error_errno(-r, "Failed to respond with to bus activation request: %m");
+                log_error_errno(r, "Failed to respond with to bus activation request: %m");
                 return r;
         }
 
@@ -538,58 +538,58 @@ static int bus_setup_api_vtables(Manager *m, sd_bus *bus) {
 #ifdef HAVE_SELINUX
         r = sd_bus_add_filter(bus, NULL, mac_selinux_filter, m);
         if (r < 0) {
-                log_error_errno(-r, "Failed to add SELinux access filter: %m");
+                log_error_errno(r, "Failed to add SELinux access filter: %m");
                 return r;
         }
 #endif
 
         r = sd_bus_add_object_vtable(bus, NULL, "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", bus_manager_vtable, m);
         if (r < 0) {
-                log_error_errno(-r, "Failed to register Manager vtable: %m");
+                log_error_errno(r, "Failed to register Manager vtable: %m");
                 return r;
         }
 
         r = sd_bus_add_fallback_vtable(bus, NULL, "/org/freedesktop/systemd1/job", "org.freedesktop.systemd1.Job", bus_job_vtable, bus_job_find, m);
         if (r < 0) {
-                log_error_errno(-r, "Failed to register Job vtable: %m");
+                log_error_errno(r, "Failed to register Job vtable: %m");
                 return r;
         }
 
         r = sd_bus_add_node_enumerator(bus, NULL, "/org/freedesktop/systemd1/job", bus_job_enumerate, m);
         if (r < 0) {
-                log_error_errno(-r, "Failed to add job enumerator: %m");
+                log_error_errno(r, "Failed to add job enumerator: %m");
                 return r;
         }
 
         r = sd_bus_add_fallback_vtable(bus, NULL, "/org/freedesktop/systemd1/unit", "org.freedesktop.systemd1.Unit", bus_unit_vtable, bus_unit_find, m);
         if (r < 0) {
-                log_error_errno(-r, "Failed to register Unit vtable: %m");
+                log_error_errno(r, "Failed to register Unit vtable: %m");
                 return r;
         }
 
         r = sd_bus_add_node_enumerator(bus, NULL, "/org/freedesktop/systemd1/unit", bus_unit_enumerate, m);
         if (r < 0) {
-                log_error_errno(-r, "Failed to add job enumerator: %m");
+                log_error_errno(r, "Failed to add job enumerator: %m");
                 return r;
         }
 
         for (t = 0; t < _UNIT_TYPE_MAX; t++) {
                 r = sd_bus_add_fallback_vtable(bus, NULL, "/org/freedesktop/systemd1/unit", unit_vtable[t]->bus_interface, unit_vtable[t]->bus_vtable, bus_unit_interface_find, m);
                 if (r < 0)  {
-                        log_error_errno(-r, "Failed to register type specific vtable for %s: %m", unit_vtable[t]->bus_interface);
+                        log_error_errno(r, "Failed to register type specific vtable for %s: %m", unit_vtable[t]->bus_interface);
                         return r;
                 }
 
                 if (unit_vtable[t]->cgroup_context_offset > 0) {
                         r = sd_bus_add_fallback_vtable(bus, NULL, "/org/freedesktop/systemd1/unit", unit_vtable[t]->bus_interface, bus_unit_cgroup_vtable, bus_unit_cgroup_find, m);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to register control group unit vtable for %s: %m", unit_vtable[t]->bus_interface);
+                                log_error_errno(r, "Failed to register control group unit vtable for %s: %m", unit_vtable[t]->bus_interface);
                                 return r;
                         }
 
                         r = sd_bus_add_fallback_vtable(bus, NULL, "/org/freedesktop/systemd1/unit", unit_vtable[t]->bus_interface, bus_cgroup_vtable, bus_cgroup_context_find, m);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to register control group vtable for %s: %m", unit_vtable[t]->bus_interface);
+                                log_error_errno(r, "Failed to register control group vtable for %s: %m", unit_vtable[t]->bus_interface);
                                 return r;
                         }
                 }
@@ -597,7 +597,7 @@ static int bus_setup_api_vtables(Manager *m, sd_bus *bus) {
                 if (unit_vtable[t]->exec_context_offset > 0) {
                         r = sd_bus_add_fallback_vtable(bus, NULL, "/org/freedesktop/systemd1/unit", unit_vtable[t]->bus_interface, bus_exec_vtable, bus_exec_context_find, m);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to register execute vtable for %s: %m", unit_vtable[t]->bus_interface);
+                                log_error_errno(r, "Failed to register execute vtable for %s: %m", unit_vtable[t]->bus_interface);
                                 return r;
                         }
                 }
@@ -605,7 +605,7 @@ static int bus_setup_api_vtables(Manager *m, sd_bus *bus) {
                 if (unit_vtable[t]->kill_context_offset > 0) {
                         r = sd_bus_add_fallback_vtable(bus, NULL, "/org/freedesktop/systemd1/unit", unit_vtable[t]->bus_interface, bus_kill_vtable, bus_kill_context_find, m);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to register kill vtable for %s: %m", unit_vtable[t]->bus_interface);
+                                log_error_errno(r, "Failed to register kill vtable for %s: %m", unit_vtable[t]->bus_interface);
                                 return r;
                         }
                 }
@@ -631,7 +631,7 @@ static int bus_setup_disconnected_match(Manager *m, sd_bus *bus) {
                         signal_disconnected, m);
 
         if (r < 0) {
-                log_error_errno(-r, "Failed to register match for Disconnected message: %m");
+                log_error_errno(r, "Failed to register match for Disconnected message: %m");
                 return r;
         }
 
@@ -667,13 +667,13 @@ static int bus_on_connection(sd_event_source *s, int fd, uint32_t revents, void
 
         r = sd_bus_new(&bus);
         if (r < 0) {
-                log_warning_errno(-r, "Failed to allocate new private connection bus: %m");
+                log_warning_errno(r, "Failed to allocate new private connection bus: %m");
                 return 0;
         }
 
         r = sd_bus_set_fd(bus, nfd, nfd);
         if (r < 0) {
-                log_warning_errno(-r, "Failed to set fd on new connection bus: %m");
+                log_warning_errno(r, "Failed to set fd on new connection bus: %m");
                 return 0;
         }
 
@@ -681,7 +681,7 @@ static int bus_on_connection(sd_event_source *s, int fd, uint32_t revents, void
 
         r = bus_check_peercred(bus);
         if (r < 0) {
-                log_warning_errno(-r, "Incoming private connection from unprivileged client, refusing: %m");
+                log_warning_errno(r, "Incoming private connection from unprivileged client, refusing: %m");
                 return 0;
         }
 
@@ -689,19 +689,19 @@ static int bus_on_connection(sd_event_source *s, int fd, uint32_t revents, void
 
         r = sd_bus_set_server(bus, 1, id);
         if (r < 0) {
-                log_warning_errno(-r, "Failed to enable server support for new connection bus: %m");
+                log_warning_errno(r, "Failed to enable server support for new connection bus: %m");
                 return 0;
         }
 
         r = sd_bus_start(bus);
         if (r < 0) {
-                log_warning_errno(-r, "Failed to start new connection bus: %m");
+                log_warning_errno(r, "Failed to start new connection bus: %m");
                 return 0;
         }
 
         r = sd_bus_attach_event(bus, m->event, SD_EVENT_PRIORITY_NORMAL);
         if (r < 0) {
-                log_warning_errno(-r, "Failed to attach new connection bus to event loop: %m");
+                log_warning_errno(r, "Failed to attach new connection bus to event loop: %m");
                 return 0;
         }
 
@@ -719,7 +719,7 @@ static int bus_on_connection(sd_event_source *s, int fd, uint32_t revents, void
                                 signal_agent_released, m);
 
                 if (r < 0) {
-                        log_warning_errno(-r, "Failed to register Released match on new connection bus: %m");
+                        log_warning_errno(r, "Failed to register Released match on new connection bus: %m");
                         return 0;
                 }
         }
@@ -730,13 +730,13 @@ static int bus_on_connection(sd_event_source *s, int fd, uint32_t revents, void
 
         r = bus_setup_api_vtables(m, bus);
         if (r < 0) {
-                log_warning_errno(-r, "Failed to set up API vtables on new connection bus: %m");
+                log_warning_errno(r, "Failed to set up API vtables on new connection bus: %m");
                 return 0;
         }
 
         r = set_put(m->private_buses, bus);
         if (r < 0) {
-                log_warning_errno(-r, "Failed to add new conenction bus to set: %m");
+                log_warning_errno(r, "Failed to add new conenction bus to set: %m");
                 return 0;
         }
 
@@ -757,7 +757,7 @@ static int bus_list_names(Manager *m, sd_bus *bus) {
 
         r = sd_bus_list_names(bus, &names, NULL);
         if (r < 0) {
-                log_error_errno(-r, "Failed to get initial list of names: %m");
+                log_error_errno(r, "Failed to get initial list of names: %m");
                 return r;
         }
 
@@ -782,7 +782,7 @@ static int bus_setup_api(Manager *m, sd_bus *bus) {
                                    SD_BUS_CREDS_EUID|SD_BUS_CREDS_EFFECTIVE_CAPS|
                                    SD_BUS_CREDS_SELINUX_CONTEXT);
         if (r < 0)
-                log_warning_errno(-r, "Failed to enable credential passing, ignoring: %m");
+                log_warning_errno(r, "Failed to enable credential passing, ignoring: %m");
 
         r = bus_setup_api_vtables(m, bus);
         if (r < 0)
@@ -798,7 +798,7 @@ static int bus_setup_api(Manager *m, sd_bus *bus) {
                         "member='NameOwnerChanged'",
                         signal_name_owner_changed, m);
         if (r < 0)
-                log_warning_errno(-r, "Failed to subscribe to NameOwnerChanged signal: %m");
+                log_warning_errno(r, "Failed to subscribe to NameOwnerChanged signal: %m");
 
         r = sd_bus_add_match(
                         bus,
@@ -810,7 +810,7 @@ static int bus_setup_api(Manager *m, sd_bus *bus) {
                         "member='ActivationRequest'",
                         signal_activation_request, m);
         if (r < 0)
-                log_warning_errno(-r, "Failed to subscribe to activation signal: %m");
+                log_warning_errno(r, "Failed to subscribe to activation signal: %m");
 
         /* Allow replacing of our name, to ease implementation of
          * reexecution, where we keep the old connection open until
@@ -819,7 +819,7 @@ static int bus_setup_api(Manager *m, sd_bus *bus) {
          * finish */
         r = sd_bus_request_name(bus,"org.freedesktop.systemd1", SD_BUS_NAME_REPLACE_EXISTING|SD_BUS_NAME_ALLOW_REPLACEMENT);
         if (r < 0) {
-                log_error_errno(-r, "Failed to register name: %m");
+                log_error_errno(r, "Failed to register name: %m");
                 return r;
         }
 
@@ -852,7 +852,7 @@ static int bus_init_api(Manager *m) {
 
                 r = sd_bus_attach_event(bus, m->event, SD_EVENT_PRIORITY_NORMAL);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to attach API bus to event loop: %m");
+                        log_error_errno(r, "Failed to attach API bus to event loop: %m");
                         return 0;
                 }
 
@@ -863,7 +863,7 @@ static int bus_init_api(Manager *m) {
 
         r = bus_setup_api(m, bus);
         if (r < 0) {
-                log_error_errno(-r, "Failed to set up API bus: %m");
+                log_error_errno(r, "Failed to set up API bus: %m");
                 return 0;
         }
 
@@ -894,7 +894,7 @@ static int bus_setup_system(Manager *m, sd_bus *bus) {
                         signal_agent_released, m);
 
         if (r < 0)
-                log_warning_errno(-r, "Failed to register Released match on system bus: %m");
+                log_warning_errno(r, "Failed to register Released match on system bus: %m");
 
         log_debug("Successfully connected to system bus.");
         return 0;
@@ -925,13 +925,13 @@ static int bus_init_system(Manager *m) {
 
         r = sd_bus_attach_event(bus, m->event, SD_EVENT_PRIORITY_NORMAL);
         if (r < 0) {
-                log_error_errno(-r, "Failed to attach system bus to event loop: %m");
+                log_error_errno(r, "Failed to attach system bus to event loop: %m");
                 return 0;
         }
 
         r = bus_setup_system(m, bus);
         if (r < 0) {
-                log_error_errno(-r, "Failed to set up system bus: %m");
+                log_error_errno(r, "Failed to set up system bus: %m");
                 return 0;
         }
 
@@ -1007,7 +1007,7 @@ static int bus_init_private(Manager *m) {
 
         r = sd_event_add_io(m->event, &s, fd, EPOLLIN, bus_on_connection, m);
         if (r < 0) {
-                log_error_errno(-r, "Failed to allocate event source: %m");
+                log_error_errno(r, "Failed to allocate event source: %m");
                 return r;
         }
 

src/core/device.c

@@ -334,7 +334,7 @@ static int device_update_unit(Manager *m, struct udev_device *dev, const char *p
         return 0;
 
 fail:
-        log_warning_errno(-r, "Failed to load device unit: %m");
+        log_warning_errno(r, "Failed to load device unit: %m");
 
         if (delete && u)
                 unit_free(u);
@@ -650,20 +650,20 @@ static int device_dispatch_io(sd_event_source *source, int fd, uint32_t revents,
         if (streq(action, "remove") || !device_is_ready(dev))  {
                 r = device_process_removed_device(m, dev);
                 if (r < 0)
-                        log_error_errno(-r, "Failed to process device remove event: %m");
+                        log_error_errno(r, "Failed to process device remove event: %m");
 
                 r = swap_process_removed_device(m, dev);
                 if (r < 0)
-                        log_error_errno(-r, "Failed to process swap device remove event: %m");
+                        log_error_errno(r, "Failed to process swap device remove event: %m");
 
         } else {
                 r = device_process_new_device(m, dev);
                 if (r < 0)
-                        log_error_errno(-r, "Failed to process device new event: %m");
+                        log_error_errno(r, "Failed to process device new event: %m");
 
                 r = swap_process_new_device(m, dev);
                 if (r < 0)
-                        log_error_errno(-r, "Failed to process swap device new event: %m");
+                        log_error_errno(r, "Failed to process swap device new event: %m");
 
                 manager_dispatch_load_queue(m);
 

src/core/execute.c

@@ -823,7 +823,7 @@ static int setup_pam(
                  * If this fails, ignore the error - but expect sd-pam threads
                  * to fail to exit normally */
                 if (setresuid(uid, uid, uid) < 0)
-                        log_error_errno(-r, "Error: Failed to setresuid() in sd-pam: %m");
+                        log_error_errno(r, "Error: Failed to setresuid() in sd-pam: %m");
 
                 /* Wait until our parent died. This will only work if
                  * the above setresuid() succeeds, otherwise the kernel
@@ -2819,7 +2819,7 @@ void exec_runtime_destroy(ExecRuntime *rt) {
 
                 r = asynchronous_job(remove_tmpdir_thread, rt->tmp_dir);
                 if (r < 0) {
-                        log_warning_errno(-r, "Failed to nuke %s: %m", rt->tmp_dir);
+                        log_warning_errno(r, "Failed to nuke %s: %m", rt->tmp_dir);
                         free(rt->tmp_dir);
                 }
 
@@ -2831,7 +2831,7 @@ void exec_runtime_destroy(ExecRuntime *rt) {
 
                 r = asynchronous_job(remove_tmpdir_thread, rt->var_tmp_dir);
                 if (r < 0) {
-                        log_warning_errno(-r, "Failed to nuke %s: %m", rt->var_tmp_dir);
+                        log_warning_errno(r, "Failed to nuke %s: %m", rt->var_tmp_dir);
                         free(rt->var_tmp_dir);
                 }
 

src/core/hostname-setup.c

@@ -64,7 +64,7 @@ int hostname_setup(void) {
                 if (r == -ENOENT)
                         enoent = true;
                 else
-                        log_warning_errno(-r, "Failed to read configured hostname: %m");
+                        log_warning_errno(r, "Failed to read configured hostname: %m");
 
                 hn = NULL;
         } else

src/core/job.c

@@ -1097,7 +1097,7 @@ int job_coldplug(Job *j) {
                         j->begin_usec + j->unit->job_timeout, 0,
                         job_dispatch_timer, j);
         if (r < 0)
-                log_debug_errno(-r, "Failed to restart timeout for job: %m");
+                log_debug_errno(r, "Failed to restart timeout for job: %m");
 
         return r;
 }

src/core/load-dropin.c

@@ -87,7 +87,7 @@ static int iterate_dir(
 
                 r = unit_add_dependency_by_name(u, dependency, de->d_name, f, true);
                 if (r < 0)
-                        log_error_errno(-r, "Cannot add dependency %s to %s, ignoring: %m", de->d_name, u->id);
+                        log_error_errno(r, "Cannot add dependency %s to %s, ignoring: %m", de->d_name, u->id);
         }
 
         return 0;
@@ -155,7 +155,7 @@ char **unit_find_dropin_paths(Unit *u) {
 
         r = conf_files_list_strv(&configs, ".conf", NULL, (const char**) strv);
         if (r < 0) {
-                log_error_errno(-r, "Failed to get list of configuration files: %m");
+                log_error_errno(r, "Failed to get list of configuration files: %m");
                 strv_free(configs);
                 return NULL;
         }

src/core/locale-setup.c

@@ -56,7 +56,7 @@ int locale_setup(char ***environment) {
                                    NULL);
 
                 if (r < 0 && r != -ENOENT)
-                        log_warning_errno(-r, "Failed to read /proc/cmdline: %m");
+                        log_warning_errno(r, "Failed to read /proc/cmdline: %m");
         }
 
         /* Hmm, nothing set on the kernel cmd line? Then let's
@@ -80,7 +80,7 @@ int locale_setup(char ***environment) {
                                    NULL);
 
                 if (r < 0 && r != -ENOENT)
-                        log_warning_errno(-r, "Failed to read /etc/locale.conf: %m");
+                        log_warning_errno(r, "Failed to read /etc/locale.conf: %m");
         }
 
         add = NULL;

src/core/machine-id-setup.c

@@ -142,7 +142,7 @@ static int generate(char id[34], const char *root) {
         /* If that didn't work, generate a random machine id */
         r = sd_id128_randomize(&buf);
         if (r < 0) {
-                log_error_errno(-r, "Failed to open /dev/urandom: %m");
+                log_error_errno(r, "Failed to open /dev/urandom: %m");
                 return r;
         }
 
@@ -242,7 +242,7 @@ int machine_id_setup(const char *root) {
                 r = write_string_file(run_machine_id, id);
         }
         if (r < 0) {
-                log_error_errno(-r, "Cannot write %s: %m", run_machine_id);
+                log_error_errno(r, "Cannot write %s: %m", run_machine_id);
                 unlink(run_machine_id);
                 return r;
         }

src/core/main.c

@@ -175,7 +175,7 @@ noreturn static void crash(int sig) {
                         /* Order things nicely. */
                         r = wait_for_terminate(pid, &status);
                         if (r < 0)
-                                log_emergency_errno(-r, "Caught <%s>, waitpid() failed: %m", signal_to_string(sig));
+                                log_emergency_errno(r, "Caught <%s>, waitpid() failed: %m", signal_to_string(sig));
                         else if (status.si_code != CLD_DUMPED)
                                 log_emergency("Caught <%s>, core dump failed.", signal_to_string(sig));
                         else
@@ -232,7 +232,7 @@ static int console_setup(void) {
 
         tty_fd = open_terminal("/dev/console", O_WRONLY|O_NOCTTY|O_CLOEXEC);
         if (tty_fd < 0) {
-                log_error_errno(-tty_fd, "Failed to open /dev/console: %m");
+                log_error_errno(tty_fd, "Failed to open /dev/console: %m");
                 return tty_fd;
         }
 
@@ -240,7 +240,7 @@ static int console_setup(void) {
          * pictures already from initrd. */
         r = reset_terminal_fd(tty_fd, false);
         if (r < 0) {
-                log_error_errno(-r, "Failed to reset /dev/console: %m");
+                log_error_errno(r, "Failed to reset /dev/console: %m");
                 return r;
         }
 
@@ -807,7 +807,7 @@ static int parse_argv(int argc, char *argv[]) {
 
                         r = set_default_unit(optarg);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to set default unit %s: %m", optarg);
+                                log_error_errno(r, "Failed to set default unit %s: %m", optarg);
                                 return r;
                         }
 
@@ -990,7 +990,7 @@ static int prepare_reexecute(Manager *m, FILE **_f, FDSet **_fds, bool switching
 
         r = manager_open_serialization(m, &f);
         if (r < 0) {
-                log_error_errno(-r, "Failed to create serialization file: %m");
+                log_error_errno(r, "Failed to create serialization file: %m");
                 goto fail;
         }
 
@@ -1001,13 +1001,13 @@ static int prepare_reexecute(Manager *m, FILE **_f, FDSet **_fds, bool switching
         fds = fdset_new();
         if (!fds) {
                 r = -ENOMEM;
-                log_error_errno(-r, "Failed to allocate fd set: %m");
+                log_error_errno(r, "Failed to allocate fd set: %m");
                 goto fail;
         }
 
         r = manager_serialize(m, f, fds, switching_root);
         if (r < 0) {
-                log_error_errno(-r, "Failed to serialize state: %m");
+                log_error_errno(r, "Failed to serialize state: %m");
                 goto fail;
         }
 
@@ -1018,13 +1018,13 @@ static int prepare_reexecute(Manager *m, FILE **_f, FDSet **_fds, bool switching
 
         r = fd_cloexec(fileno(f), false);
         if (r < 0) {
-                log_error_errno(-r, "Failed to disable O_CLOEXEC for serialization: %m");
+                log_error_errno(r, "Failed to disable O_CLOEXEC for serialization: %m");
                 goto fail;
         }
 
         r = fdset_cloexec(fds, false);
         if (r < 0) {
-                log_error_errno(-r, "Failed to disable O_CLOEXEC for serialization fds: %m");
+                log_error_errno(r, "Failed to disable O_CLOEXEC for serialization fds: %m");
                 goto fail;
         }
 
@@ -1071,7 +1071,7 @@ static int bump_rlimit_nofile(struct rlimit *saved_rlimit) {
         nl.rlim_cur = nl.rlim_max = 64*1024;
         r = setrlimit_closest(RLIMIT_NOFILE, &nl);
         if (r < 0) {
-                log_error_errno(-r, "Setting RLIMIT_NOFILE failed: %m");
+                log_error_errno(r, "Setting RLIMIT_NOFILE failed: %m");
                 return r;
         }
 
@@ -1154,20 +1154,20 @@ static int enforce_syscall_archs(Set *archs) {
                 if (r == -EEXIST)
                         continue;
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to add architecture to seccomp: %m");
+                        log_error_errno(r, "Failed to add architecture to seccomp: %m");
                         goto finish;
                 }
         }
 
         r = seccomp_attr_set(seccomp, SCMP_FLTATR_CTL_NNP, 0);
         if (r < 0) {
-                log_error_errno(-r, "Failed to unset NO_NEW_PRIVS: %m");
+                log_error_errno(r, "Failed to unset NO_NEW_PRIVS: %m");
                 goto finish;
         }
 
         r = seccomp_load(seccomp);
         if (r < 0)
-                log_error_errno(-r, "Failed to add install architecture seccomp: %m");
+                log_error_errno(r, "Failed to add install architecture seccomp: %m");
 
 finish:
         seccomp_release(seccomp);
@@ -1193,7 +1193,7 @@ static int status_welcome(void) {
         }
 
         if (r < 0 && r != -ENOENT)
-                log_warning_errno(-r, "Failed to read os-release file: %m");
+                log_warning_errno(r, "Failed to read os-release file: %m");
 
         return status_printf(NULL, false, false,
                              "\nWelcome to \x1B[%sm%s\x1B[0m!\n",
@@ -1324,7 +1324,7 @@ int main(int argc, char *argv[]) {
                                  */
                                 r = clock_set_timezone(&min);
                                 if (r < 0)
-                                        log_error_errno(-r, "Failed to apply local time delta, ignoring: %m");
+                                        log_error_errno(r, "Failed to apply local time delta, ignoring: %m");
                                 else
                                         log_info("RTC configured in localtime, applying delta of %i minutes to system time.", min);
                         } else if (!in_initrd()) {
@@ -1383,7 +1383,7 @@ int main(int argc, char *argv[]) {
         /* Initialize default unit */
         r = set_default_unit(SPECIAL_DEFAULT_TARGET);
         if (r < 0) {
-                log_emergency_errno(-r, "Failed to set default unit %s: %m", SPECIAL_DEFAULT_TARGET);
+                log_emergency_errno(r, "Failed to set default unit %s: %m", SPECIAL_DEFAULT_TARGET);
                 error_message = "Failed to set default unit";
                 goto finish;
         }
@@ -1422,7 +1422,7 @@ int main(int argc, char *argv[]) {
         if (arg_running_as == SYSTEMD_SYSTEM) {
                 r = parse_proc_cmdline(parse_proc_cmdline_item);
                 if (r < 0)
-                        log_warning_errno(-r, "Failed to parse kernel command line, ignoring: %m");
+                        log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m");
         }
 
         /* Note that this also parses bits from the kernel command
@@ -1488,7 +1488,7 @@ int main(int argc, char *argv[]) {
         /* Remember open file descriptors for later deserialization */
         r = fdset_new_fill(&fds);
         if (r < 0) {
-                log_emergency_errno(-r, "Failed to allocate fd set: %m");
+                log_emergency_errno(r, "Failed to allocate fd set: %m");
                 error_message = "Failed to allocate fd set";
                 goto finish;
         } else
@@ -1591,13 +1591,13 @@ int main(int argc, char *argv[]) {
         if (arg_capability_bounding_set_drop) {
                 r = capability_bounding_set_drop_usermode(arg_capability_bounding_set_drop);
                 if (r < 0) {
-                        log_emergency_errno(-r, "Failed to drop capability bounding set of usermode helpers: %m");
+                        log_emergency_errno(r, "Failed to drop capability bounding set of usermode helpers: %m");
                         error_message = "Failed to drop capability bounding set of usermode helpers";
                         goto finish;
                 }
                 r = capability_bounding_set_drop(arg_capability_bounding_set_drop, true);
                 if (r < 0) {
-                        log_emergency_errno(-r, "Failed to drop capability bounding set: %m");
+                        log_emergency_errno(r, "Failed to drop capability bounding set: %m");
                         error_message = "Failed to drop capability bounding set";
                         goto finish;
                 }
@@ -1626,7 +1626,7 @@ int main(int argc, char *argv[]) {
                 if (empty_etc) {
                         r = unit_file_preset_all(UNIT_FILE_SYSTEM, false, NULL, UNIT_FILE_PRESET_FULL, false, NULL, 0);
                         if (r < 0)
-                                log_warning_errno(-r, "Failed to populate /etc with preset unit settings, ignoring: %m");
+                                log_warning_errno(r, "Failed to populate /etc with preset unit settings, ignoring: %m");
                         else
                                 log_info("Populated /etc with preset unit settings.");
                 }
@@ -1634,7 +1634,7 @@ int main(int argc, char *argv[]) {
 
         r = manager_new(arg_running_as, arg_action == ACTION_TEST, &m);
         if (r < 0) {
-                log_emergency_errno(-r, "Failed to allocate manager object: %m");
+                log_emergency_errno(r, "Failed to allocate manager object: %m");
                 error_message = "Failed to allocate manager object";
                 goto finish;
         }
@@ -1672,7 +1672,7 @@ int main(int argc, char *argv[]) {
 
         r = manager_startup(m, arg_serialization, fds);
         if (r < 0)
-                log_error_errno(-r, "Failed to fully start up daemon: %m");
+                log_error_errno(r, "Failed to fully start up daemon: %m");
 
         /* This will close all file descriptors that were opened, but
          * not claimed by any unit. */
@@ -1759,7 +1759,7 @@ int main(int argc, char *argv[]) {
         for (;;) {
                 r = manager_loop(m);
                 if (r < 0) {
-                        log_emergency_errno(-r, "Failed to run main loop: %m");
+                        log_emergency_errno(r, "Failed to run main loop: %m");
                         error_message = "Failed to run main loop";
                         goto finish;
                 }
@@ -1775,7 +1775,7 @@ int main(int argc, char *argv[]) {
                         log_info("Reloading.");
                         r = manager_reload(m);
                         if (r < 0)
-                                log_error_errno(-r, "Failed to reload: %m");
+                                log_error_errno(r, "Failed to reload: %m");
                         break;
 
                 case MANAGER_REEXECUTE:
@@ -1876,7 +1876,7 @@ finish:
                         /* And switch root with MS_MOVE, because we remove the old directory afterwards and detach it. */
                         r = switch_root(switch_root_dir, "/mnt", true, MS_MOVE);
                         if (r < 0)
-                                log_error_errno(-r, "Failed to switch root, trying to continue: %m");
+                                log_error_errno(r, "Failed to switch root, trying to continue: %m");
                 }
 
                 args_size = MAX(6, argc+1);

src/core/manager.c

@@ -303,7 +303,7 @@ static int manager_watch_idle_pipe(Manager *m) {
 
         r = sd_event_add_io(m->event, &m->idle_pipe_event_source, m->idle_pipe[2], EPOLLIN, manager_dispatch_idle_pipe_fd, m);
         if (r < 0) {
-                log_error_errno(-r, "Failed to watch idle pipe: %m");
+                log_error_errno(r, "Failed to watch idle pipe: %m");
                 return r;
         }
 
@@ -349,7 +349,7 @@ static int manager_setup_time_change(Manager *m) {
 
         r = sd_event_add_io(m->event, &m->time_change_event_source, m->time_change_fd, EPOLLIN, manager_dispatch_time_change_fd, m);
         if (r < 0) {
-                log_error_errno(-r, "Failed to create time change event source: %m");
+                log_error_errno(r, "Failed to create time change event source: %m");
                 return r;
         }
 
@@ -697,7 +697,7 @@ static int manager_setup_notify(Manager *m) {
         if (!m->notify_event_source) {
                 r = sd_event_add_io(m->event, &m->notify_event_source, m->notify_fd, EPOLLIN, manager_dispatch_notify_fd, m);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to allocate notify event source: %m");
+                        log_error_errno(r, "Failed to allocate notify event source: %m");
                         return -errno;
                 }
 
@@ -705,7 +705,7 @@ static int manager_setup_notify(Manager *m) {
                  * still identify to which service an exit message belongs */
                 r = sd_event_source_set_priority(m->notify_event_source, -7);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to set priority of notify event source: %m");
+                        log_error_errno(r, "Failed to set priority of notify event source: %m");
                         return r;
                 }
         }
@@ -1060,7 +1060,7 @@ static void manager_build_unit_path_cache(Manager *m) {
         return;
 
 fail:
-        log_error_errno(-r, "Failed to build unit path cache: %m");
+        log_error_errno(r, "Failed to build unit path cache: %m");
 
         set_free_free(m->unit_path_cache);
         m->unit_path_cache = NULL;
@@ -1989,7 +1989,7 @@ int manager_loop(Manager *m) {
 
                 r = sd_event_run(m->event, wait_usec);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to run event loop: %m");
+                        log_error_errno(r, "Failed to run event loop: %m");
                         return r;
                 }
         }

src/core/mount.c

@@ -1627,7 +1627,7 @@ static int mount_dispatch_io(sd_event_source *source, int fd, uint32_t revents,
 
         r = mount_load_proc_self_mountinfo(m, true);
         if (r < 0) {
-                log_error_errno(-r, "Failed to reread /proc/self/mountinfo: %m");
+                log_error_errno(r, "Failed to reread /proc/self/mountinfo: %m");
 
                 /* Reset flags, just in case, for later calls */
                 LIST_FOREACH(units_by_type, u, m->units_by_type[UNIT_MOUNT]) {

src/core/path.c

@@ -250,7 +250,7 @@ static void path_spec_mkdir(PathSpec *s, mode_t mode) {
 
         r = mkdir_p_label(s->path, mode);
         if (r < 0)
-                log_warning_errno(-r, "mkdir(%s) failed: %m", s->path);
+                log_warning_errno(r, "mkdir(%s) failed: %m", s->path);
 }
 
 static void path_spec_dump(PathSpec *s, FILE *f, const char *prefix) {

src/core/scope.c

@@ -290,7 +290,7 @@ static int scope_start(Unit *u) {
 
         r = unit_realize_cgroup(u);
         if (r < 0) {
-                log_error_errno(-r, "Failed to realize cgroup: %m");
+                log_error_errno(r, "Failed to realize cgroup: %m");
                 return r;
         }
 

src/core/shutdown.c

@@ -240,7 +240,7 @@ int main(int argc, char *argv[]) {
                         } else if (r > 0)
                                 log_info("Not all file systems unmounted, %d left.", r);
                         else
-                                log_error_errno(-r, "Failed to unmount file systems: %m");
+                                log_error_errno(r, "Failed to unmount file systems: %m");
                 }
 
                 if (need_swapoff) {
@@ -252,7 +252,7 @@ int main(int argc, char *argv[]) {
                         } else if (r > 0)
                                 log_info("Not all swaps deactivated, %d left.", r);
                         else
-                                log_error_errno(-r, "Failed to deactivate swaps: %m");
+                                log_error_errno(r, "Failed to deactivate swaps: %m");
                 }
 
                 if (need_loop_detach) {
@@ -264,7 +264,7 @@ int main(int argc, char *argv[]) {
                         } else if (r > 0)
                                 log_info("Not all loop devices detached, %d left.", r);
                         else
-                                log_error_errno(-r, "Failed to detach loop devices: %m");
+                                log_error_errno(r, "Failed to detach loop devices: %m");
                 }
 
                 if (need_dm_detach) {
@@ -276,7 +276,7 @@ int main(int argc, char *argv[]) {
                         } else if (r > 0)
                                 log_info("Not all DM devices detached, %d left.", r);
                         else
-                                log_error_errno(-r, "Failed to detach DM devices: %m");
+                                log_error_errno(r, "Failed to detach DM devices: %m");
                 }
 
                 if (!need_umount && !need_swapoff && !need_loop_detach && !need_dm_detach) {
@@ -329,7 +329,7 @@ int main(int argc, char *argv[]) {
                         execv("/shutdown", argv);
                         log_error("Failed to execute shutdown binary: %m");
                 } else
-                        log_error_errno(-r, "Failed to switch root to \"/run/initramfs\": %m");
+                        log_error_errno(r, "Failed to switch root to \"/run/initramfs\": %m");
 
         }
 
@@ -416,7 +416,7 @@ int main(int argc, char *argv[]) {
         r = -errno;
 
   error:
-        log_emergency_errno(-r, "Critical error while doing system shutdown: %m");
+        log_emergency_errno(r, "Critical error while doing system shutdown: %m");
 
         freeze();
 }

src/core/socket.c

@@ -1506,7 +1506,7 @@ static int socket_chown(Socket *s, pid_t *_pid) {
 
         fail_child:
                 log_open();
-                log_error_errno(-r, "Failed to chown socket at step %s: %m", exit_status_to_string(ret, EXIT_STATUS_SYSTEMD));
+                log_error_errno(r, "Failed to chown socket at step %s: %m", exit_status_to_string(ret, EXIT_STATUS_SYSTEMD));
 
                 _exit(ret);
         }

src/core/swap.c

@@ -1170,7 +1170,7 @@ static int swap_dispatch_io(sd_event_source *source, int fd, uint32_t revents, v
 
         r = swap_load_proc_swaps(m, true);
         if (r < 0) {
-                log_error_errno(-r, "Failed to reread /proc/swaps: %m");
+                log_error_errno(r, "Failed to reread /proc/swaps: %m");
 
                 /* Reset flags, just in case, for late calls */
                 LIST_FOREACH(units_by_type, u, m->units_by_type[UNIT_SWAP]) {

src/core/timer.c

@@ -148,7 +148,7 @@ static int timer_setup_persistent(Timer *t) {
 
                         r = get_home_dir(&h);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to determine home directory: %m");
+                                log_error_errno(r, "Failed to determine home directory: %m");
                                 return r;
                         }
 

src/core/transaction.c

@@ -723,7 +723,7 @@ int transaction_activate(Transaction *tr, Manager *m, JobMode mode, sd_bus_error
         /* Tenth step: apply changes */
         r = transaction_apply(tr, m, mode);
         if (r < 0) {
-                log_warning_errno(-r, "Failed to apply transaction: %m");
+                log_warning_errno(r, "Failed to apply transaction: %m");
                 return r;
         }
 

src/cryptsetup/cryptsetup-generator.c

@@ -255,7 +255,7 @@ static int create_disk(
                                   "# Automatically generated by systemd-cryptsetup-generator \n\n"
                                   "[Unit]\nJobTimeoutSec=0");
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to write device drop-in: %m");
+                        log_error_errno(r, "Failed to write device drop-in: %m");
                         return r;
                 }
         }
@@ -327,7 +327,7 @@ int main(int argc, char *argv[]) {
 
         z = parse_proc_cmdline(parse_proc_cmdline_item);
         if (z < 0)
-                log_warning_errno(-z, "Failed to parse kernel command line, ignoring: %m");
+                log_warning_errno(z, "Failed to parse kernel command line, ignoring: %m");
 
         if (!arg_enabled) {
                 r = r2 = EXIT_SUCCESS;

src/cryptsetup/cryptsetup.c

@@ -281,7 +281,7 @@ static int get_password(const char *name, usec_t until, bool accept_cached, char
 
         r = ask_password_auto(text, "drive-harddisk", id, until, accept_cached, passwords);
         if (r < 0) {
-                log_error_errno(-r, "Failed to query password: %m");
+                log_error_errno(r, "Failed to query password: %m");
                 return r;
         }
 
@@ -297,7 +297,7 @@ static int get_password(const char *name, usec_t until, bool accept_cached, char
 
                 r = ask_password_auto(text, "drive-harddisk", id, until, false, &passwords2);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to query verification password: %m");
+                        log_error_errno(r, "Failed to query verification password: %m");
                         return r;
                 }
 
@@ -355,7 +355,7 @@ static int attach_tcrypt(struct crypt_device *cd,
         if (key_file) {
                 r = read_one_line_file(key_file, &passphrase);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to read password file '%s': %m", key_file);
+                        log_error_errno(r, "Failed to read password file '%s': %m", key_file);
                         return -EAGAIN;
                 }
 
@@ -439,7 +439,7 @@ static int attach_luks_or_plain(struct crypt_device *cd,
         }
 
         if (r < 0) {
-                log_error_errno(-r, "Loading of cryptographic parameters failed: %m");
+                log_error_errno(r, "Loading of cryptographic parameters failed: %m");
                 return r;
         }
 
@@ -454,7 +454,7 @@ static int attach_luks_or_plain(struct crypt_device *cd,
                                                      key_file, arg_keyfile_size,
                                                      arg_keyfile_offset, flags);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to activate with key file '%s': %m", key_file);
+                        log_error_errno(r, "Failed to activate with key file '%s': %m", key_file);
                         return -EAGAIN;
                 }
         } else {
@@ -567,7 +567,7 @@ int main(int argc, char *argv[]) {
 
                 k = crypt_init(&cd, argv[3]);
                 if (k) {
-                        log_error_errno(-k, "crypt_init() failed: %m");
+                        log_error_errno(k, "crypt_init() failed: %m");
                         goto finish;
                 }
 
@@ -623,7 +623,7 @@ int main(int argc, char *argv[]) {
                                 key_file = NULL;
                                 continue;
                         } else if (k != -EPERM) {
-                                log_error_errno(-k, "Failed to activate: %m");
+                                log_error_errno(k, "Failed to activate: %m");
                                 goto finish;
                         }
 
@@ -641,7 +641,7 @@ int main(int argc, char *argv[]) {
 
                 k = crypt_init_by_name(&cd, argv[2]);
                 if (k) {
-                        log_error_errno(-k, "crypt_init() failed: %m");
+                        log_error_errno(k, "crypt_init() failed: %m");
                         goto finish;
                 }
 
@@ -649,7 +649,7 @@ int main(int argc, char *argv[]) {
 
                 k = crypt_deactivate(cd, argv[2]);
                 if (k < 0) {
-                        log_error_errno(-k, "Failed to deactivate: %m");
+                        log_error_errno(k, "Failed to deactivate: %m");
                         goto finish;
                 }
 

src/dbus1-generator/dbus1-generator.c

@@ -103,7 +103,7 @@ static int create_dbus_files(
 
                 r = fflush_and_check(f);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to write %s: %m", a);
+                        log_error_errno(r, "Failed to write %s: %m", a);
                         return r;
                 }
 
@@ -140,7 +140,7 @@ static int create_dbus_files(
 
         r = fflush_and_check(f);
         if (r < 0) {
-                log_error_errno(-r, "Failed to write %s: %m", b);
+                log_error_errno(r, "Failed to write %s: %m", b);
                 return r;
         }
 
@@ -332,7 +332,7 @@ int main(int argc, char *argv[]) {
                 type = "system";
                 units = SYSTEM_DATA_UNIT_PATH;
         } else {
-                log_error_errno(-r, "Failed to determine whether we are running as user or system instance: %m");
+                log_error_errno(r, "Failed to determine whether we are running as user or system instance: %m");
                 return r;
         }
 

src/debug-generator/debug-generator.c

@@ -152,7 +152,7 @@ int main(int argc, char *argv[]) {
 
         r = parse_proc_cmdline(parse_proc_cmdline_item);
         if (r < 0)
-                log_warning_errno(-r, "Failed to parse kernel command line, ignoring: %m");
+                log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m");
 
         if (arg_debug_shell) {
                 r = strv_extend(&arg_wants, "debug-shell.service");

src/delta/delta.c

@@ -227,7 +227,7 @@ static int enumerate_dir_d(Hashmap *top, Hashmap *bottom, Hashmap *drops, const
 
         r = get_files_in_directory(path, &list);
         if (r < 0){
-                log_error_errno(-r, "Failed to enumerate %s: %m", path);
+                log_error_errno(r, "Failed to enumerate %s: %m", path);
                 return r;
         }
 

src/detect-virt/detect-virt.c

@@ -131,7 +131,7 @@ int main(int argc, char *argv[]) {
 
                 v = detect_virtualization(&id);
                 if (v < 0) {
-                        log_error_errno(-v, "Failed to check for virtualization: %m");
+                        log_error_errno(v, "Failed to check for virtualization: %m");
                         return EXIT_FAILURE;
                 }
 
@@ -142,7 +142,7 @@ int main(int argc, char *argv[]) {
         case ONLY_CONTAINER:
                 r = detect_container(&id);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to check for container: %m");
+                        log_error_errno(r, "Failed to check for container: %m");
                         return EXIT_FAILURE;
                 }
 
@@ -152,7 +152,7 @@ int main(int argc, char *argv[]) {
         case ONLY_VM:
                 r = detect_vm(&id);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to check for vm: %m");
+                        log_error_errno(r, "Failed to check for vm: %m");
                         return EXIT_FAILURE;
                 }
 

src/efi-boot-generator/efi-boot-generator.c

@@ -80,7 +80,7 @@ int main(int argc, char *argv[]) {
                 log_debug("EFI loader partition unknown, exiting.");
                 return EXIT_SUCCESS;
         } else if (r < 0) {
-                log_error_errno(-r, "Failed to read ESP partition UUID: %m");
+                log_error_errno(r, "Failed to read ESP partition UUID: %m");
                 return EXIT_FAILURE;
         }
 

src/firstboot/firstboot.c

@@ -98,7 +98,7 @@ static void print_welcome(void) {
         }
 
         if (r < 0 && r != -ENOENT)
-                log_warning_errno(-r, "Failed to read os-release file: %m");
+                log_warning_errno(r, "Failed to read os-release file: %m");
 
         printf("\nWelcome to your new installation of %s!\nPlease configure a few basic system settings:\n\n",
                isempty(pretty_name) ? "Linux" : pretty_name);
@@ -167,7 +167,7 @@ static int prompt_loop(const char *text, char **l, bool (*is_valid)(const char *
 
                 r = ask_string(&p, "%s %s (empty to skip): ", draw_special_char(DRAW_TRIANGULAR_BULLET), text);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to query user: %m");
+                        log_error_errno(r, "Failed to query user: %m");
                         return r;
                 }
 
@@ -220,7 +220,7 @@ static int prompt_locale(void) {
 
         r = get_locales(&locales);
         if (r < 0) {
-                log_error_errno(-r, "Cannot query locales list: %m");
+                log_error_errno(r, "Cannot query locales list: %m");
                 return r;
         }
 
@@ -263,7 +263,7 @@ static int process_locale(void) {
                 r = copy_file("/etc/locale.conf", etc_localeconf, 0, 0644);
                 if (r != -ENOENT) {
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to copy %s: %m", etc_localeconf);
+                                log_error_errno(r, "Failed to copy %s: %m", etc_localeconf);
                                 return r;
                         }
 
@@ -289,7 +289,7 @@ static int process_locale(void) {
         mkdir_parents(etc_localeconf, 0755);
         r = write_env_file(etc_localeconf, locales);
         if (r < 0) {
-                log_error_errno(-r, "Failed to write %s: %m", etc_localeconf);
+                log_error_errno(r, "Failed to write %s: %m", etc_localeconf);
                 return r;
         }
 
@@ -309,7 +309,7 @@ static int prompt_timezone(void) {
 
         r = get_timezones(&zones);
         if (r < 0) {
-                log_error_errno(-r, "Cannot query timezone list: %m");
+                log_error_errno(r, "Cannot query timezone list: %m");
                 return r;
         }
 
@@ -343,7 +343,7 @@ static int process_timezone(void) {
                 r = readlink_malloc("/etc/localtime", &p);
                 if (r != -ENOENT) {
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to read host timezone: %m");
+                                log_error_errno(r, "Failed to read host timezone: %m");
                                 return r;
                         }
 
@@ -394,7 +394,7 @@ static int prompt_hostname(void) {
 
                 r = ask_string(&h, "%s Please enter hostname for new system (empty to skip): ", draw_special_char(DRAW_TRIANGULAR_BULLET));
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to query hostname: %m");
+                        log_error_errno(r, "Failed to query hostname: %m");
                         return r;
                 }
 
@@ -434,7 +434,7 @@ static int process_hostname(void) {
         mkdir_parents(etc_hostname, 0755);
         r = write_string_file(etc_hostname, arg_hostname);
         if (r < 0) {
-                log_error_errno(-r, "Failed to write %s: %m", etc_hostname);
+                log_error_errno(r, "Failed to write %s: %m", etc_hostname);
                 return r;
         }
 
@@ -457,7 +457,7 @@ static int process_machine_id(void) {
         mkdir_parents(etc_machine_id, 0755);
         r = write_string_file(etc_machine_id, sd_id128_to_string(arg_machine_id, id));
         if (r < 0) {
-                log_error_errno(-r, "Failed to write machine id: %m");
+                log_error_errno(r, "Failed to write machine id: %m");
                 return r;
         }
 
@@ -490,7 +490,7 @@ static int prompt_root_password(void) {
 
                 r = ask_password_tty(msg1, 0, false, NULL, &a);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to query root password: %m");
+                        log_error_errno(r, "Failed to query root password: %m");
                         return r;
                 }
 
@@ -501,7 +501,7 @@ static int prompt_root_password(void) {
 
                 r = ask_password_tty(msg2, 0, false, NULL, &b);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to query root password: %m");
+                        log_error_errno(r, "Failed to query root password: %m");
                         clear_string(a);
                         return r;
                 }
@@ -592,7 +592,7 @@ static int process_root_password(void) {
 
                         r = write_root_shadow(etc_shadow, p);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to write %s: %m", etc_shadow);
+                                log_error_errno(r, "Failed to write %s: %m", etc_shadow);
                                 return r;
                         }
 
@@ -610,7 +610,7 @@ static int process_root_password(void) {
 
         r = dev_urandom(raw, 16);
         if (r < 0) {
-                log_error_errno(-r, "Failed to get salt: %m");
+                log_error_errno(r, "Failed to get salt: %m");
                 return r;
         }
 
@@ -636,7 +636,7 @@ static int process_root_password(void) {
 
         r = write_root_shadow(etc_shadow, &item);
         if (r < 0) {
-                log_error_errno(-r, "Failed to write %s: %m", etc_shadow);
+                log_error_errno(r, "Failed to write %s: %m", etc_shadow);
                 return r;
         }
 
@@ -804,7 +804,7 @@ static int parse_argv(int argc, char *argv[]) {
 
                         r = read_one_line_file(optarg, &arg_root_password);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to read %s: %m", optarg);
+                                log_error_errno(r, "Failed to read %s: %m", optarg);
                                 return r;
                         }
 
@@ -871,7 +871,7 @@ static int parse_argv(int argc, char *argv[]) {
 
                         r = sd_id128_randomize(&arg_machine_id);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to generate randomized machine ID: %m");
+                                log_error_errno(r, "Failed to generate randomized machine ID: %m");
                                 return r;
                         }
 

src/fsck/fsck.c

@@ -54,7 +54,7 @@ static void start_target(const char *target) {
 
         r = bus_open_system_systemd(&bus);
         if (r < 0) {
-                log_error_errno(-r, "Failed to get D-Bus connection: %m");
+                log_error_errno(r, "Failed to get D-Bus connection: %m");
                 return;
         }
 
@@ -238,7 +238,7 @@ int main(int argc, char *argv[]) {
 
         q = parse_proc_cmdline(parse_proc_cmdline_item);
         if (q < 0)
-                log_warning_errno(-q, "Failed to parse kernel command line, ignoring: %m");
+                log_warning_errno(q, "Failed to parse kernel command line, ignoring: %m");
 
         test_files();
 
@@ -309,7 +309,7 @@ int main(int argc, char *argv[]) {
                         log_info("fsck.%s doesn't exist, not checking file system on %s", type, device);
                         return EXIT_SUCCESS;
                 } else if (r < 0)
-                        log_warning_errno(-r, "fsck.%s cannot be used for %s: %m", type, device);
+                        log_warning_errno(r, "fsck.%s cannot be used for %s: %m", type, device);
         }
 
         if (arg_show_progress)
@@ -365,7 +365,7 @@ int main(int argc, char *argv[]) {
 
         q = wait_for_terminate(pid, &status);
         if (q < 0) {
-                log_error_errno(-q, "waitid(): %m");
+                log_error_errno(q, "waitid(): %m");
                 goto finish;
         }
 

src/fstab-generator/fstab-generator.c

@@ -134,7 +134,7 @@ static int add_swap(
 
         r = fflush_and_check(f);
         if (r < 0) {
-                log_error_errno(-r, "Failed to write unit file %s: %m", unit);
+                log_error_errno(r, "Failed to write unit file %s: %m", unit);
                 return r;
         }
 
@@ -600,7 +600,7 @@ int main(int argc, char *argv[]) {
 
         r = parse_proc_cmdline(parse_proc_cmdline_item);
         if (r < 0)
-                log_warning_errno(-r, "Failed to parse kernel command line, ignoring: %m");
+                log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m");
 
         /* Always honour root= and usr= in the kernel command line if we are in an initrd */
         if (in_initrd()) {

src/gpt-auto-generator/gpt-auto-generator.c

@@ -205,7 +205,7 @@ static int add_cryptsetup(const char *id, const char *what, bool rw, char **devi
                         "[Unit]\n"
                         "JobTimeoutSec=0\n"); /* the binary handles timeouts anyway */
         if (r < 0) {
-                log_error_errno(-r, "Failed to write device drop-in: %m");
+                log_error_errno(r, "Failed to write device drop-in: %m");
                 return r;
         }
 
@@ -488,7 +488,7 @@ static int enumerate_partitions(dev_t devnum) {
 
         r = udev_enumerate_scan_devices(e);
         if (r < 0) {
-                log_error_errno(-r, "Failed to enumerate partitions on %s: %m", node);
+                log_error_errno(r, "Failed to enumerate partitions on %s: %m", node);
                 return r;
         }
 
@@ -713,7 +713,7 @@ static int add_root_mount(void) {
                 log_debug("EFI loader partition unknown, exiting.");
                 return 0;
         } else if (r < 0) {
-                log_error_errno(-r, "Failed to read ESP partition UUID: %m");
+                log_error_errno(r, "Failed to read ESP partition UUID: %m");
                 return r;
         }
 
@@ -740,7 +740,7 @@ static int add_mounts(void) {
 
         r = get_block_device("/", &devno);
         if (r < 0) {
-                log_error_errno(-r, "Failed to determine block device of root file system: %m");
+                log_error_errno(r, "Failed to determine block device of root file system: %m");
                 return r;
         } else if (r == 0) {
                 log_debug("Root file system not on a (single) block device.");
@@ -774,7 +774,7 @@ int main(int argc, char *argv[]) {
 
         r = parse_proc_cmdline(parse_proc_cmdline_item);
         if (r < 0)
-                log_warning_errno(-r, "Failed to parse kernel command line, ignoring: %m");
+                log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m");
 
         if (!arg_enabled) {
                 log_debug("Disabled, exiting.");

src/hibernate-resume/hibernate-resume-generator.c

@@ -88,7 +88,7 @@ int main(int argc, char *argv[]) {
 
         r = parse_proc_cmdline(parse_proc_cmdline_item);
         if (r < 0)
-                log_warning_errno(-r, "Failed to parse kernel command line, ignoring: %m");
+                log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m");
 
         r = process_resume();
         free(arg_resume_dev);

src/hibernate-resume/hibernate-resume.c

@@ -69,7 +69,7 @@ int main(int argc, char *argv[]) {
 
         r = write_string_file("/sys/power/resume", major_minor);
         if (r < 0) {
-                log_error_errno(-r, "Failed to write '%s' to /sys/power/resume: %m", major_minor);
+                log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor);
                 return EXIT_FAILURE;
         }
 

src/hostname/hostnamectl.c

@@ -529,7 +529,7 @@ int main(int argc, char *argv[]) {
 
         r = bus_open_transport(arg_transport, arg_host, false, &bus);
         if (r < 0) {
-                log_error_errno(-r, "Failed to create bus connection: %m");
+                log_error_errno(r, "Failed to create bus connection: %m");
                 goto finish;
         }
 

src/hostname/hostnamed.c

@@ -442,7 +442,7 @@ static int method_set_hostname(sd_bus *bus, sd_bus_message *m, void *userdata, s
 
         r = context_update_kernel_hostname(c);
         if (r < 0) {
-                log_error_errno(-r, "Failed to set host name: %m");
+                log_error_errno(r, "Failed to set host name: %m");
                 return sd_bus_error_set_errnof(error, r, "Failed to set hostname: %s", strerror(-r));
         }
 
@@ -494,13 +494,13 @@ static int method_set_static_hostname(sd_bus *bus, sd_bus_message *m, void *user
 
         r = context_update_kernel_hostname(c);
         if (r < 0) {
-                log_error_errno(-r, "Failed to set host name: %m");
+                log_error_errno(r, "Failed to set host name: %m");
                 return sd_bus_error_set_errnof(error, r, "Failed to set hostname: %s", strerror(-r));
         }
 
         r = context_write_data_static_hostname(c);
         if (r < 0) {
-                log_error_errno(-r, "Failed to write static host name: %m");
+                log_error_errno(r, "Failed to write static host name: %m");
                 return sd_bus_error_set_errnof(error, r, "Failed to set static hostname: %s", strerror(-r));
         }
 
@@ -573,7 +573,7 @@ static int set_machine_info(Context *c, sd_bus *bus, sd_bus_message *m, int prop
 
         r = context_write_data_machine_info(c);
         if (r < 0) {
-                log_error_errno(-r, "Failed to write machine info: %m");
+                log_error_errno(r, "Failed to write machine info: %m");
                 return sd_bus_error_set_errnof(error, r, "Failed to write machine info: %s", strerror(-r));
         }
 
@@ -646,25 +646,25 @@ static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) {
 
         r = sd_bus_default_system(&bus);
         if (r < 0) {
-                log_error_errno(-r, "Failed to get system bus connection: %m");
+                log_error_errno(r, "Failed to get system bus connection: %m");
                 return r;
         }
 
         r = sd_bus_add_object_vtable(bus, NULL, "/org/freedesktop/hostname1", "org.freedesktop.hostname1", hostname_vtable, c);
         if (r < 0) {
-                log_error_errno(-r, "Failed to register object: %m");
+                log_error_errno(r, "Failed to register object: %m");
                 return r;
         }
 
         r = sd_bus_request_name(bus, "org.freedesktop.hostname1", 0);
         if (r < 0) {
-                log_error_errno(-r, "Failed to register name: %m");
+                log_error_errno(r, "Failed to register name: %m");
                 return r;
         }
 
         r = sd_bus_attach_event(bus, event, 0);
         if (r < 0) {
-                log_error_errno(-r, "Failed to attach bus to event loop: %m");
+                log_error_errno(r, "Failed to attach bus to event loop: %m");
                 return r;
         }
 
@@ -701,7 +701,7 @@ int main(int argc, char *argv[]) {
 
         r = sd_event_default(&event);
         if (r < 0) {
-                log_error_errno(-r, "Failed to allocate event loop: %m");
+                log_error_errno(r, "Failed to allocate event loop: %m");
                 goto finish;
         }
 
@@ -713,13 +713,13 @@ int main(int argc, char *argv[]) {
 
         r = context_read_data(&context);
         if (r < 0) {
-                log_error_errno(-r, "Failed to read hostname and machine information: %m");
+                log_error_errno(r, "Failed to read hostname and machine information: %m");
                 goto finish;
         }
 
         r = bus_event_loop_with_idle(event, bus, "org.freedesktop.hostname1", DEFAULT_EXIT_USEC, NULL, NULL);
         if (r < 0) {
-                log_error_errno(-r, "Failed to run event loop: %m");
+                log_error_errno(r, "Failed to run event loop: %m");
                 goto finish;
         }
 

src/initctl/initctl.c

@@ -328,7 +328,7 @@ static int server_init(Server *s, unsigned n_sockets) {
 
         r = bus_open_system_systemd(&s->bus);
         if (r < 0) {
-                log_error_errno(-r, "Failed to get D-Bus connection: %m");
+                log_error_errno(r, "Failed to get D-Bus connection: %m");
                 r = -EIO;
                 goto fail;
         }
@@ -355,7 +355,7 @@ static int process_event(Server *s, struct epoll_event *ev) {
         f = (Fifo*) ev->data.ptr;
         r = fifo_process(f);
         if (r < 0) {
-                log_info_errno(-r, "Got error on fifo: %m");
+                log_info_errno(r, "Got error on fifo: %m");
                 fifo_free(f);
                 return r;
         }
@@ -385,7 +385,7 @@ int main(int argc, char *argv[]) {
 
         n = sd_listen_fds(true);
         if (n < 0) {
-                log_error_errno(-r, "Failed to read listening file descriptors from environment: %m");
+                log_error_errno(r, "Failed to read listening file descriptors from environment: %m");
                 return EXIT_FAILURE;
         }
 

src/journal-remote/journal-gatewayd.c

@@ -155,14 +155,14 @@ static ssize_t request_reader_entries(
                         r = sd_journal_next(m->journal);
 
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to advance journal pointer: %m");
+                        log_error_errno(r, "Failed to advance journal pointer: %m");
                         return MHD_CONTENT_READER_END_WITH_ERROR;
                 } else if (r == 0) {
 
                         if (m->follow) {
                                 r = sd_journal_wait(m->journal, (uint64_t) -1);
                                 if (r < 0) {
-                                        log_error_errno(-r, "Couldn't wait for journal event: %m");
+                                        log_error_errno(r, "Couldn't wait for journal event: %m");
                                         return MHD_CONTENT_READER_END_WITH_ERROR;
                                 }
 
@@ -177,7 +177,7 @@ static ssize_t request_reader_entries(
 
                         r = sd_journal_test_cursor(m->journal, m->cursor);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to test cursor: %m");
+                                log_error_errno(r, "Failed to test cursor: %m");
                                 return MHD_CONTENT_READER_END_WITH_ERROR;
                         }
 
@@ -205,7 +205,7 @@ static ssize_t request_reader_entries(
 
                 r = output_journal(m->tmp, m->journal, m->mode, 0, OUTPUT_FULL_WIDTH, NULL);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to serialize item: %m");
+                        log_error_errno(r, "Failed to serialize item: %m");
                         return MHD_CONTENT_READER_END_WITH_ERROR;
                 }
 
@@ -394,7 +394,7 @@ static int request_parse_arguments_iterator(
 
                         r = sd_id128_get_boot(&bid);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to get boot ID: %m");
+                                log_error_errno(r, "Failed to get boot ID: %m");
                                 return MHD_NO;
                         }
 
@@ -543,7 +543,7 @@ static ssize_t request_reader_fields(
 
                 r = sd_journal_enumerate_unique(m->journal, &d, &l);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to advance field index: %m");
+                        log_error_errno(r, "Failed to advance field index: %m");
                         return MHD_CONTENT_READER_END_WITH_ERROR;
                 } else if (r == 0)
                         return MHD_CONTENT_READER_END_OF_STREAM;
@@ -566,7 +566,7 @@ static ssize_t request_reader_fields(
 
                 r = output_field(m->tmp, m->mode, d, l);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to serialize item: %m");
+                        log_error_errno(r, "Failed to serialize item: %m");
                         return MHD_CONTENT_READER_END_WITH_ERROR;
                 }
 
@@ -910,7 +910,7 @@ static int parse_argv(int argc, char *argv[]) {
                         }
                         r = read_full_file(optarg, &key_pem, NULL);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to read key file: %m");
+                                log_error_errno(r, "Failed to read key file: %m");
                                 return r;
                         }
                         assert(key_pem);
@@ -923,7 +923,7 @@ static int parse_argv(int argc, char *argv[]) {
                         }
                         r = read_full_file(optarg, &cert_pem, NULL);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to read certificate file: %m");
+                                log_error_errno(r, "Failed to read certificate file: %m");
                                 return r;
                         }
                         assert(cert_pem);
@@ -937,7 +937,7 @@ static int parse_argv(int argc, char *argv[]) {
                         }
                         r = read_full_file(optarg, &trust_pem, NULL);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to read CA certificate file: %m");
+                                log_error_errno(r, "Failed to read CA certificate file: %m");
                                 return r;
                         }
                         assert(trust_pem);
@@ -992,7 +992,7 @@ int main(int argc, char *argv[]) {
 
         n = sd_listen_fds(1);
         if (n < 0) {
-                log_error_errno(-n, "Failed to determine passed sockets: %m");
+                log_error_errno(n, "Failed to determine passed sockets: %m");
                 goto finish;
         } else if (n > 1) {
                 log_error("Can't listen on more than one socket.");

src/journal-remote/journal-remote-write.c

@@ -153,7 +153,7 @@ int writer_write(Writer *w,
                 return 1;
         }
 
-        log_debug_errno(-r, "%s: Write failed, rotating: %m", w->journal->path);
+        log_debug_errno(r, "%s: Write failed, rotating: %m", w->journal->path);
         r = do_rotate(&w->journal, compress, seal);
         if (r < 0)
                 return r;

src/journal-remote/journal-remote.c

@@ -151,13 +151,13 @@ static int spawn_getter(const char *getter, const char *url) {
         assert(getter);
         r = strv_split_quoted(&words, getter, false);
         if (r < 0) {
-                log_error_errno(-r, "Failed to split getter option: %m");
+                log_error_errno(r, "Failed to split getter option: %m");
                 return r;
         }
 
         r = strv_extend(&words, url);
         if (r < 0) {
-                log_error_errno(-r, "Failed to create command line: %m");
+                log_error_errno(r, "Failed to create command line: %m");
                 return r;
         }
 
@@ -400,7 +400,7 @@ static int add_source(RemoteServer *s, int fd, char* name, bool own_name) {
 
         r = sd_event_source_set_description(source->event, name);
         if (r < 0) {
-                log_error_errno(-r, "Failed to set source name for fd:%d: %m", fd);
+                log_error_errno(r, "Failed to set source name for fd:%d: %m", fd);
                 goto error;
         }
 
@@ -662,7 +662,7 @@ static int setup_microhttpd_server(RemoteServer *s,
 
         r = fd_nonblock(fd, true);
         if (r < 0) {
-                log_error_errno(-r, "Failed to make fd:%d nonblocking: %m", fd);
+                log_error_errno(r, "Failed to make fd:%d nonblocking: %m", fd);
                 return r;
         }
 
@@ -720,13 +720,13 @@ static int setup_microhttpd_server(RemoteServer *s,
                             epoll_fd, EPOLLIN,
                             dispatch_http_event, d);
         if (r < 0) {
-                log_error_errno(-r, "Failed to add event callback: %m");
+                log_error_errno(r, "Failed to add event callback: %m");
                 goto error;
         }
 
         r = sd_event_source_set_description(d->event, "epoll-fd");
         if (r < 0) {
-                log_error_errno(-r, "Failed to set source name: %m");
+                log_error_errno(r, "Failed to set source name: %m");
                 goto error;
         }
 
@@ -738,7 +738,7 @@ static int setup_microhttpd_server(RemoteServer *s,
 
         r = hashmap_put(s->daemons, &d->fd, d);
         if (r < 0) {
-                log_error_errno(-r, "Failed to add daemon to hashmap: %m");
+                log_error_errno(r, "Failed to add daemon to hashmap: %m");
                 goto error;
         }
 
@@ -841,7 +841,7 @@ static int remoteserver_init(RemoteServer *s,
 
         r = sd_event_default(&s->events);
         if (r < 0) {
-                log_error_errno(-r, "Failed to allocate event loop: %m");
+                log_error_errno(r, "Failed to allocate event loop: %m");
                 return r;
         }
 
@@ -882,7 +882,7 @@ static int remoteserver_init(RemoteServer *s,
 
                         r = getnameinfo_pretty(fd, &hostname);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to retrieve remote name: %m");
+                                log_error_errno(r, "Failed to retrieve remote name: %m");
                                 return r;
                         }
 
@@ -1051,7 +1051,7 @@ static int dispatch_raw_source_event(sd_event_source *event,
         } else if (r == -EAGAIN) {
                 return 0;
         } else if (r < 0) {
-                log_info_errno(-r, "Closing connection: %m");
+                log_info_errno(r, "Closing connection: %m");
                 remove_source(server, fd);
                 return 0;
         } else
@@ -1084,7 +1084,7 @@ static int accept_connection(const char* type, int fd,
 
                 r = socket_address_print(addr, &a);
                 if (r < 0) {
-                        log_error_errno(-r, "socket_address_print(): %m");
+                        log_error_errno(r, "socket_address_print(): %m");
                         close(fd2);
                         return r;
                 }
@@ -1542,7 +1542,7 @@ int main(int argc, char **argv) {
 
         r = sd_event_set_watchdog(s.events, true);
         if (r < 0)
-                log_error_errno(-r, "Failed to enable watchdog: %m");
+                log_error_errno(r, "Failed to enable watchdog: %m");
         else
                 log_debug("Watchdog is %s.", r > 0 ? "enabled" : "disabled");
 
@@ -1561,7 +1561,7 @@ int main(int argc, char **argv) {
 
                 r = sd_event_run(s.events, -1);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to run event loop: %m");
+                        log_error_errno(r, "Failed to run event loop: %m");
                         break;
                 }
         }

src/journal-remote/journal-upload-journal.c

@@ -26,7 +26,7 @@ static ssize_t write_entry(char *buf, size_t size, Uploader *u) {
 
                         r = sd_journal_get_cursor(u->journal, &u->current_cursor);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to get cursor: %m");
+                                log_error_errno(r, "Failed to get cursor: %m");
                                 return r;
                         }
 
@@ -52,7 +52,7 @@ static ssize_t write_entry(char *buf, size_t size, Uploader *u) {
 
                         r = sd_journal_get_realtime_usec(u->journal, &realtime);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to get realtime timestamp: %m");
+                                log_error_errno(r, "Failed to get realtime timestamp: %m");
                                 return r;
                         }
 
@@ -79,7 +79,7 @@ static ssize_t write_entry(char *buf, size_t size, Uploader *u) {
 
                         r = sd_journal_get_monotonic_usec(u->journal, &monotonic, &boot_id);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to get monotonic timestamp: %m");
+                                log_error_errno(r, "Failed to get monotonic timestamp: %m");
                                 return r;
                         }
 
@@ -106,7 +106,7 @@ static ssize_t write_entry(char *buf, size_t size, Uploader *u) {
 
                         r = sd_journal_get_monotonic_usec(u->journal, NULL, &boot_id);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to get monotonic timestamp: %m");
+                                log_error_errno(r, "Failed to get monotonic timestamp: %m");
                                 return r;
                         }
 
@@ -305,7 +305,7 @@ static int process_journal_input(Uploader *u, int skip) {
 
         r = sd_journal_next_skip(u->journal, skip);
         if (r < 0) {
-                log_error_errno(-r, "Failed to skip to next entry: %m");
+                log_error_errno(r, "Failed to skip to next entry: %m");
                 return r;
         } else if (r < skip)
                 return 0;
@@ -321,7 +321,7 @@ int check_journal_input(Uploader *u) {
 
                 r = sd_journal_process(u->journal);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to process journal: %m");
+                        log_error_errno(r, "Failed to process journal: %m");
                         close_journal_input(u);
                         return r;
                 }
@@ -364,7 +364,7 @@ int open_journal_for_upload(Uploader *u,
         if (follow) {
                 fd = sd_journal_get_fd(j);
                 if (fd < 0) {
-                        log_error_errno(-fd, "sd_journal_get_fd failed: %m");
+                        log_error_errno(fd, "sd_journal_get_fd failed: %m");
                         return fd;
                 }
 
@@ -380,7 +380,7 @@ int open_journal_for_upload(Uploader *u,
                 r = sd_event_add_io(u->events, &u->input_event,
                                     fd, events, dispatch_journal_input, u);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to register input event: %m");
+                        log_error_errno(r, "Failed to register input event: %m");
                         return r;
                 }
 

src/journal-remote/journal-upload.c

@@ -147,7 +147,7 @@ static int update_cursor_state(Uploader *u) {
 
 finish:
         if (r < 0)
-                log_error_errno(-r, "Failed to save state %s: %m", u->state_file);
+                log_error_errno(r, "Failed to save state %s: %m", u->state_file);
 
         return r;
 }
@@ -375,7 +375,7 @@ static int open_file_for_upload(Uploader *u, const char *filename) {
                                     fd, EPOLLIN, dispatch_fd_input, u);
                 if (r < 0) {
                         if (r != -EPERM || arg_follow > 0) {
-                                log_error_errno(-r, "Failed to register input event: %m");
+                                log_error_errno(r, "Failed to register input event: %m");
                                 return r;
                         }
 
@@ -459,13 +459,13 @@ static int setup_uploader(Uploader *u, const char *url, const char *state_file)
 
         r = sd_event_default(&u->events);
         if (r < 0) {
-                log_error_errno(-r, "sd_event_default failed: %m");
+                log_error_errno(r, "sd_event_default failed: %m");
                 return r;
         }
 
         r = setup_signals(u);
         if (r < 0) {
-                log_error_errno(-r, "Failed to set up signals: %m");
+                log_error_errno(r, "Failed to set up signals: %m");
                 return r;
         }
 
@@ -702,7 +702,7 @@ static int parse_argv(int argc, char *argv[]) {
                 case ARG_FILE:
                         r = glob_extend(&arg_file, optarg);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to add paths: %m");
+                                log_error_errno(r, "Failed to add paths: %m");
                                 return r;
                         };
                         break;
@@ -869,7 +869,7 @@ int main(int argc, char **argv) {
 
                 r = sd_event_run(u.events, u.timeout);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to run event loop: %m");
+                        log_error_errno(r, "Failed to run event loop: %m");
                         break;
                 }
         }

src/journal-remote/microhttpd-util.c

@@ -171,14 +171,14 @@ static int verify_cert_authorized(gnutls_session_t session) {
 
         r = gnutls_certificate_verify_peers2(session, &status);
         if (r < 0) {
-                log_error_errno(-r, "gnutls_certificate_verify_peers2 failed: %m");
+                log_error_errno(r, "gnutls_certificate_verify_peers2 failed: %m");
                 return r;
         }
 
         type = gnutls_certificate_type_get(session);
         r = gnutls_certificate_verification_status_print(status, type, &out, 0);
         if (r < 0) {
-                log_error_errno(-r, "gnutls_certificate_verification_status_print failed: %m");
+                log_error_errno(r, "gnutls_certificate_verification_status_print failed: %m");
                 return r;
         }
 

src/journal/cat.c

@@ -134,7 +134,7 @@ int main(int argc, char *argv[]) {
 
         fd = sd_journal_stream_fd(arg_identifier, arg_priority, arg_level_prefix);
         if (fd < 0) {
-                log_error_errno(-fd, "Failed to create stream fd: %m");
+                log_error_errno(fd, "Failed to create stream fd: %m");
                 r = fd;
                 goto finish;
         }
@@ -164,7 +164,7 @@ int main(int argc, char *argv[]) {
         if (saved_stderr >= 0)
                 dup3(saved_stderr, STDERR_FILENO, 0);
 
-        log_error_errno(-r, "Failed to execute process: %m");
+        log_error_errno(r, "Failed to execute process: %m");
 
 finish:
         safe_close(fd);

src/journal/catalog.c

@@ -342,7 +342,7 @@ static long write_catalog(const char *database, Hashmap *h, struct strbuf *sb,
 
         r = mkdir_p(d, 0775);
         if (r < 0) {
-                log_error_errno(-r, "Recursive mkdir %s: %m", d);
+                log_error_errno(r, "Recursive mkdir %s: %m", d);
                 return r;
         }
 
@@ -422,7 +422,7 @@ int catalog_update(const char* database, const char* root, const char* const* di
 
         r = conf_files_list_strv(&files, ".catalog", root, dirs);
         if (r < 0) {
-                log_error_errno(-r, "Failed to get catalog files: %m");
+                log_error_errno(r, "Failed to get catalog files: %m");
                 goto finish;
         }
 
@@ -463,7 +463,7 @@ int catalog_update(const char* database, const char* root, const char* const* di
 
         r = write_catalog(database, h, sb, items, n);
         if (r < 0)
-                log_error_errno(-r, "Failed to write %s: %m", database);
+                log_error_errno(r, "Failed to write %s: %m", database);
         else
                 log_debug("%s: wrote %u items, with %zu bytes of strings, %ld total size.",
                           database, n, sb->len, r);

src/journal/coredump.c

@@ -313,7 +313,7 @@ static int save_external_coredump(
 
         r = make_filename(info, &fn);
         if (r < 0) {
-                log_error_errno(-r, "Failed to determine coredump file name: %m");
+                log_error_errno(r, "Failed to determine coredump file name: %m");
                 return r;
         }
 
@@ -337,7 +337,7 @@ static int save_external_coredump(
                 log_error("Not enough disk space for coredump of %s (%s), refusing.", info[INFO_PID], info[INFO_COMM]);
                 goto fail;
         } else if (r < 0) {
-                log_error_errno(-r, "Failed to dump coredump to file: %m");
+                log_error_errno(r, "Failed to dump coredump to file: %m");
                 goto fail;
         }
 
@@ -379,7 +379,7 @@ static int save_external_coredump(
 
                 r = compress_stream(fd, fd_compressed, -1);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to compress %s: %m", tmp_compressed);
+                        log_error_errno(r, "Failed to compress %s: %m", tmp_compressed);
                         goto fail_compressed;
                 }
 
@@ -446,7 +446,7 @@ static int allocate_journal_field(int fd, size_t size, char **ret, size_t *ret_s
 
         n = read(fd, field + 9, size);
         if (n < 0) {
-                log_error_errno(-n, "Failed to read core data: %m");
+                log_error_errno(n, "Failed to read core data: %m");
                 return (int) n;
         }
         if ((size_t) n < size) {
@@ -841,7 +841,7 @@ int main(int argc, char* argv[]) {
                 else if (r == -EINVAL)
                         log_warning("Failed to generate stack trace: %s", dwfl_errmsg(dwfl_errno()));
                 else
-                        log_warning_errno(-r, "Failed to generate stack trace: %m");
+                        log_warning_errno(r, "Failed to generate stack trace: %m");
         }
 
         if (!core_message)
@@ -868,7 +868,7 @@ log:
 
         r = sd_journal_sendv(iovec, j);
         if (r < 0)
-                log_error_errno(-r, "Failed to log coredump: %m");
+                log_error_errno(r, "Failed to log coredump: %m");
 
 finish:
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;

src/journal/coredumpctl.c

@@ -73,7 +73,7 @@ static Set *new_matches(void) {
 
         r = set_consume(set, tmp);
         if (r < 0) {
-                log_error_errno(-r, "failed to add to set: %m");
+                log_error_errno(r, "failed to add to set: %m");
                 set_free(set);
                 return NULL;
         }
@@ -110,13 +110,13 @@ static int add_match(Set *set, const char *match) {
         log_debug("Adding pattern: %s", pattern);
         r = set_consume(set, pattern);
         if (r < 0) {
-                log_error_errno(-r, "Failed to add pattern: %m");
+                log_error_errno(r, "Failed to add pattern: %m");
                 goto fail;
         }
 
         return 0;
 fail:
-        log_error_errno(-r, "Failed to add match: %m");
+        log_error_errno(r, "Failed to add match: %m");
         return r;
 }
 
@@ -327,7 +327,7 @@ static int print_list(FILE* file, sd_journal *j, int had_legend) {
 
         r = sd_journal_get_realtime_usec(j, &t);
         if (r < 0) {
-                log_error_errno(-r, "Failed to get realtime timestamp: %m");
+                log_error_errno(r, "Failed to get realtime timestamp: %m");
                 return r;
         }
 
@@ -522,7 +522,7 @@ static int focus(sd_journal *j) {
         if (r == 0)
                 r = sd_journal_previous(j);
         if (r < 0) {
-                log_error_errno(-r, "Failed to search journal: %m");
+                log_error_errno(r, "Failed to search journal: %m");
                 return r;
         }
         if (r == 0) {
@@ -586,7 +586,7 @@ static int save_core(sd_journal *j, int fd, char **path, bool *unlink_temp) {
          * compressed file (probably uncached). */
         r = sd_journal_get_data(j, "COREDUMP_FILENAME", (const void**) &data, &len);
         if (r < 0 && r != -ENOENT)
-                log_warning_errno(-r, "Failed to retrieve COREDUMP_FILENAME: %m");
+                log_warning_errno(r, "Failed to retrieve COREDUMP_FILENAME: %m");
         else if (r == 0)
                 retrieve(data, len, "COREDUMP_FILENAME", &filename);
 
@@ -655,7 +655,7 @@ static int save_core(sd_journal *j, int fd, char **path, bool *unlink_temp) {
 
                         r = decompress_stream(filename, fdf, fd, -1);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to decompress %s: %m", filename);
+                                log_error_errno(r, "Failed to decompress %s: %m", filename);
                                 goto error;
                         }
 #else
@@ -667,7 +667,7 @@ static int save_core(sd_journal *j, int fd, char **path, bool *unlink_temp) {
                         if (r == -ENOENT)
                                 log_error("Cannot retrieve coredump from journal nor disk.");
                         else
-                                log_error_errno(-r, "Failed to retrieve COREDUMP field: %m");
+                                log_error_errno(r, "Failed to retrieve COREDUMP field: %m");
                         goto error;
                 }
 
@@ -705,7 +705,7 @@ static int dump_core(sd_journal* j) {
 
         r = save_core(j, output ? fileno(output) : STDOUT_FILENO, NULL, NULL);
         if (r < 0) {
-                log_error_errno(-r, "Coredump retrieval failed: %m");
+                log_error_errno(r, "Coredump retrieval failed: %m");
                 return r;
         }
 
@@ -736,7 +736,7 @@ static int run_gdb(sd_journal *j) {
 
         r = sd_journal_get_data(j, "COREDUMP_EXE", (const void**) &data, &len);
         if (r < 0) {
-                log_error_errno(-r, "Failed to retrieve COREDUMP_EXE field: %m");
+                log_error_errno(r, "Failed to retrieve COREDUMP_EXE field: %m");
                 return r;
         }
 
@@ -760,7 +760,7 @@ static int run_gdb(sd_journal *j) {
 
         r = save_core(j, -1, &path, &unlink_path);
         if (r < 0) {
-                log_error_errno(-r, "Failed to retrieve core: %m");
+                log_error_errno(r, "Failed to retrieve core: %m");
                 return r;
         }
 
@@ -820,7 +820,7 @@ int main(int argc, char *argv[]) {
 
         r = sd_journal_open(&j, SD_JOURNAL_LOCAL_ONLY);
         if (r < 0) {
-                log_error_errno(-r, "Failed to open journal: %m");
+                log_error_errno(r, "Failed to open journal: %m");
                 goto end;
         }
 

src/journal/journalctl.c

@@ -502,7 +502,7 @@ static int parse_argv(int argc, char *argv[]) {
                 case ARG_FILE:
                         r = glob_extend(&arg_file, optarg);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to add paths: %m");
+                                log_error_errno(r, "Failed to add paths: %m");
                                 return r;
                         };
                         break;
@@ -750,7 +750,7 @@ static int generate_new_id128(void) {
 
         r = sd_id128_randomize(&id);
         if (r < 0) {
-                log_error_errno(-r, "Failed to generate ID: %m");
+                log_error_errno(r, "Failed to generate ID: %m");
                 return r;
         }
 
@@ -852,7 +852,7 @@ static int add_matches(sd_journal *j, char **args) {
                 }
 
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to add match '%s': %m", *i);
+                        log_error_errno(r, "Failed to add match '%s': %m", *i);
                         return r;
                 }
         }
@@ -1030,7 +1030,7 @@ static int add_boot(sd_journal *j) {
         r = get_boot_id_by_offset(j, &arg_boot_id, arg_boot_offset);
         if (r < 0) {
                 if (sd_id128_equal(arg_boot_id, SD_ID128_NULL))
-                        log_error_errno(-r, "Failed to look up boot %+i: %m", arg_boot_offset);
+                        log_error_errno(r, "Failed to look up boot %+i: %m", arg_boot_offset);
                 else
                         log_error("Failed to look up boot ID "SD_ID128_FORMAT_STR"%+i: %s",
                                   SD_ID128_FORMAT_VAL(arg_boot_id), arg_boot_offset, strerror(-r));
@@ -1041,7 +1041,7 @@ static int add_boot(sd_journal *j) {
 
         r = sd_journal_add_match(j, match, sizeof(match) - 1);
         if (r < 0) {
-                log_error_errno(-r, "Failed to add match: %m");
+                log_error_errno(r, "Failed to add match: %m");
                 return r;
         }
 
@@ -1061,7 +1061,7 @@ static int add_dmesg(sd_journal *j) {
 
         r = sd_journal_add_match(j, "_TRANSPORT=kernel", strlen("_TRANSPORT=kernel"));
         if (r < 0) {
-                log_error_errno(-r, "Failed to add match: %m");
+                log_error_errno(r, "Failed to add match: %m");
                 return r;
         }
 
@@ -1264,7 +1264,7 @@ static int add_priorities(sd_journal *j) {
 
                         r = sd_journal_add_match(j, match, strlen(match));
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to add match: %m");
+                                log_error_errno(r, "Failed to add match: %m");
                                 return r;
                         }
                 }
@@ -1328,13 +1328,13 @@ static int setup_keys(void) {
 
         r = sd_id128_get_machine(&machine);
         if (r < 0) {
-                log_error_errno(-r, "Failed to get machine ID: %m");
+                log_error_errno(r, "Failed to get machine ID: %m");
                 return r;
         }
 
         r = sd_id128_get_boot(&boot);
         if (r < 0) {
-                log_error_errno(-r, "Failed to get boot ID: %m");
+                log_error_errno(r, "Failed to get boot ID: %m");
                 return r;
         }
 
@@ -1683,7 +1683,7 @@ static int flush_to_var(void) {
          * daemon and set up inotify to wait for the flushed file to appear */
         r = bus_open_system_systemd(&bus);
         if (r < 0) {
-                log_error_errno(-r, "Failed to get D-Bus connection: %m");
+                log_error_errno(r, "Failed to get D-Bus connection: %m");
                 return r;
         }
 
@@ -1726,13 +1726,13 @@ static int flush_to_var(void) {
 
                 r = fd_wait_for_event(watch_fd, POLLIN, USEC_INFINITY);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to wait for event: %m");
+                        log_error_errno(r, "Failed to wait for event: %m");
                         return r;
                 }
 
                 r = flush_fd(watch_fd);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to flush inotify events: %m");
+                        log_error_errno(r, "Failed to flush inotify events: %m");
                         return r;
                 }
         }
@@ -1789,7 +1789,7 @@ int main(int argc, char *argv[]) {
                 if (arg_action == ACTION_UPDATE_CATALOG) {
                         r = catalog_update(database, arg_root, catalog_file_dirs);
                         if (r < 0)
-                                log_error_errno(-r, "Failed to list catalog: %m");
+                                log_error_errno(r, "Failed to list catalog: %m");
                 } else {
                         bool oneline = arg_action == ACTION_LIST_CATALOG;
 
@@ -1799,7 +1799,7 @@ int main(int argc, char *argv[]) {
                         else
                                 r = catalog_list(stdout, database, oneline);
                         if (r < 0)
-                                log_error_errno(-r, "Failed to list catalog: %m");
+                                log_error_errno(r, "Failed to list catalog: %m");
                 }
 
                 goto finish;
@@ -1859,7 +1859,7 @@ int main(int argc, char *argv[]) {
 
                         q = journal_directory_vacuum(d->path, arg_vacuum_size, arg_vacuum_time, NULL, true);
                         if (q < 0) {
-                                log_error_errno(-q, "Failed to vacuum: %m");
+                                log_error_errno(q, "Failed to vacuum: %m");
                                 r = q;
                         }
                 }
@@ -1887,25 +1887,25 @@ int main(int argc, char *argv[]) {
         strv_free(arg_user_units);
 
         if (r < 0) {
-                log_error_errno(-r, "Failed to add filter for units: %m");
+                log_error_errno(r, "Failed to add filter for units: %m");
                 return EXIT_FAILURE;
         }
 
         r = add_syslog_identifier(j);
         if (r < 0) {
-                log_error_errno(-r, "Failed to add filter for syslog identifiers: %m");
+                log_error_errno(r, "Failed to add filter for syslog identifiers: %m");
                 return EXIT_FAILURE;
         }
 
         r = add_priorities(j);
         if (r < 0) {
-                log_error_errno(-r, "Failed to add filter for priorities: %m");
+                log_error_errno(r, "Failed to add filter for priorities: %m");
                 return EXIT_FAILURE;
         }
 
         r = add_matches(j, argv + optind);
         if (r < 0) {
-                log_error_errno(-r, "Failed to add filters: %m");
+                log_error_errno(r, "Failed to add filters: %m");
                 return EXIT_FAILURE;
         }
 
@@ -1928,7 +1928,7 @@ int main(int argc, char *argv[]) {
 
                 r = sd_journal_query_unique(j, arg_field);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to query unique data objects: %m");
+                        log_error_errno(r, "Failed to query unique data objects: %m");
                         return EXIT_FAILURE;
                 }
 
@@ -1960,7 +1960,7 @@ int main(int argc, char *argv[]) {
         if (arg_cursor || arg_after_cursor) {
                 r = sd_journal_seek_cursor(j, arg_cursor ?: arg_after_cursor);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to seek to cursor: %m");
+                        log_error_errno(r, "Failed to seek to cursor: %m");
                         return EXIT_FAILURE;
                 }
                 if (!arg_reverse)
@@ -1975,7 +1975,7 @@ int main(int argc, char *argv[]) {
         } else if (arg_since_set && !arg_reverse) {
                 r = sd_journal_seek_realtime_usec(j, arg_since);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to seek to date: %m");
+                        log_error_errno(r, "Failed to seek to date: %m");
                         return EXIT_FAILURE;
                 }
                 r = sd_journal_next(j);
@@ -1983,7 +1983,7 @@ int main(int argc, char *argv[]) {
         } else if (arg_until_set && arg_reverse) {
                 r = sd_journal_seek_realtime_usec(j, arg_until);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to seek to date: %m");
+                        log_error_errno(r, "Failed to seek to date: %m");
                         return EXIT_FAILURE;
                 }
                 r = sd_journal_previous(j);
@@ -1991,7 +1991,7 @@ int main(int argc, char *argv[]) {
         } else if (arg_lines >= 0) {
                 r = sd_journal_seek_tail(j);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to seek to tail: %m");
+                        log_error_errno(r, "Failed to seek to tail: %m");
                         return EXIT_FAILURE;
                 }
 
@@ -2000,7 +2000,7 @@ int main(int argc, char *argv[]) {
         } else if (arg_reverse) {
                 r = sd_journal_seek_tail(j);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to seek to tail: %m");
+                        log_error_errno(r, "Failed to seek to tail: %m");
                         return EXIT_FAILURE;
                 }
 
@@ -2009,7 +2009,7 @@ int main(int argc, char *argv[]) {
         } else {
                 r = sd_journal_seek_head(j);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to seek to head: %m");
+                        log_error_errno(r, "Failed to seek to head: %m");
                         return EXIT_FAILURE;
                 }
 
@@ -2017,7 +2017,7 @@ int main(int argc, char *argv[]) {
         }
 
         if (r < 0) {
-                log_error_errno(-r, "Failed to iterate through journal: %m");
+                log_error_errno(r, "Failed to iterate through journal: %m");
                 return EXIT_FAILURE;
         }
 
@@ -2030,7 +2030,7 @@ int main(int argc, char *argv[]) {
 
                 r = sd_journal_get_cutoff_realtime_usec(j, &start, &end);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to get cutoff: %m");
+                        log_error_errno(r, "Failed to get cutoff: %m");
                         goto finish;
                 }
 
@@ -2055,7 +2055,7 @@ int main(int argc, char *argv[]) {
                                 else
                                         r = sd_journal_previous(j);
                                 if (r < 0) {
-                                        log_error_errno(-r, "Failed to iterate through journal: %m");
+                                        log_error_errno(r, "Failed to iterate through journal: %m");
                                         goto finish;
                                 }
                                 if (r == 0)
@@ -2067,7 +2067,7 @@ int main(int argc, char *argv[]) {
 
                                 r = sd_journal_get_realtime_usec(j, &usec);
                                 if (r < 0) {
-                                        log_error_errno(-r, "Failed to determine timestamp: %m");
+                                        log_error_errno(r, "Failed to determine timestamp: %m");
                                         goto finish;
                                 }
                                 if (usec > arg_until)
@@ -2079,7 +2079,7 @@ int main(int argc, char *argv[]) {
 
                                 r = sd_journal_get_realtime_usec(j, &usec);
                                 if (r < 0) {
-                                        log_error_errno(-r, "Failed to determine timestamp: %m");
+                                        log_error_errno(r, "Failed to determine timestamp: %m");
                                         goto finish;
                                 }
                                 if (usec < arg_since)
@@ -2124,7 +2124,7 @@ int main(int argc, char *argv[]) {
 
                                 r = sd_journal_get_cursor(j, &cursor);
                                 if (r < 0 && r != -EADDRNOTAVAIL)
-                                        log_error_errno(-r, "Failed to get cursor: %m");
+                                        log_error_errno(r, "Failed to get cursor: %m");
                                 else if (r >= 0)
                                         printf("-- cursor: %s\n", cursor);
                         }
@@ -2134,7 +2134,7 @@ int main(int argc, char *argv[]) {
 
                 r = sd_journal_wait(j, (uint64_t) -1);
                 if (r < 0) {
-                        log_error_errno(-r, "Couldn't wait for journal event: %m");
+                        log_error_errno(r, "Couldn't wait for journal event: %m");
                         goto finish;
                 }
 

src/journal/journald-audit.c

@@ -309,7 +309,7 @@ static int map_all_fields(
 
                         r = m->map(m->journal_field, &v, iov, n_iov_allocated, n_iov);
                         if (r < 0) {
-                                log_debug_errno(-r, "Failed to parse audit array: %m");
+                                log_debug_errno(r, "Failed to parse audit array: %m");
                                 return r;
                         }
 
@@ -323,7 +323,7 @@ static int map_all_fields(
                 if (!mapped) {
                         r = map_generic_field(prefix, &p, iov, n_iov_allocated, n_iov);
                         if (r < 0) {
-                                log_debug_errno(-r, "Failed to parse audit array: %m");
+                                log_debug_errno(r, "Failed to parse audit array: %m");
                                 return r;
                         }
 
@@ -548,14 +548,14 @@ int server_open_audit(Server *s) {
 
         r = sd_event_add_io(s->event, &s->audit_event_source, s->audit_fd, EPOLLIN, process_datagram, s);
         if (r < 0) {
-                log_error_errno(-r, "Failed to add audit fd to event loop: %m");
+                log_error_errno(r, "Failed to add audit fd to event loop: %m");
                 return r;
         }
 
         /* We are listening now, try to enable audit */
         r = enable_audit(s->audit_fd, true);
         if (r < 0)
-                log_warning_errno(-r, "Failed to issue audit enable call: %m");
+                log_warning_errno(r, "Failed to issue audit enable call: %m");
 
         return 0;
 }

src/journal/journald-kmsg.c

@@ -413,13 +413,13 @@ int server_open_dev_kmsg(Server *s) {
                         goto fail;
                 }
 
-                log_error_errno(-r, "Failed to add /dev/kmsg fd to event loop: %m");
+                log_error_errno(r, "Failed to add /dev/kmsg fd to event loop: %m");
                 goto fail;
         }
 
         r = sd_event_source_set_priority(s->dev_kmsg_event_source, SD_EVENT_PRIORITY_IMPORTANT+10);
         if (r < 0) {
-                log_error_errno(-r, "Failed to adjust priority of kmsg event source: %m");
+                log_error_errno(r, "Failed to adjust priority of kmsg event source: %m");
                 goto fail;
         }
 

src/journal/journald-native.c

@@ -405,7 +405,7 @@ void server_process_native_file(
 
                 n = pread(fd, p, st.st_size, 0);
                 if (n < 0)
-                        log_error_errno(-n, "Failed to read file, ignoring: %m");
+                        log_error_errno(n, "Failed to read file, ignoring: %m");
                 else if (n > 0)
                         server_process_native_message(s, p, n, ucred, tv, label, label_len);
         }
@@ -463,7 +463,7 @@ int server_open_native_socket(Server*s) {
 
         r = sd_event_add_io(s->event, &s->native_event_source, s->native_fd, EPOLLIN, process_datagram, s);
         if (r < 0) {
-                log_error_errno(-r, "Failed to add native server fd to event loop: %m");
+                log_error_errno(r, "Failed to add native server fd to event loop: %m");
                 return r;
         }
 

src/journal/journald-server.c

@@ -204,7 +204,7 @@ void server_fix_perms(Server *s, JournalFile *f, uid_t uid) {
 
         r = fchmod(f->fd, 0640);
         if (r < 0)
-                log_warning_errno(-r, "Failed to fix access mode on %s, ignoring: %m", f->path);
+                log_warning_errno(r, "Failed to fix access mode on %s, ignoring: %m", f->path);
 
 #ifdef HAVE_ACL
         if (uid <= SYSTEM_UID_MAX)
@@ -348,19 +348,19 @@ void server_sync(Server *s) {
         if (s->system_journal) {
                 r = journal_file_set_offline(s->system_journal);
                 if (r < 0)
-                        log_error_errno(-r, "Failed to sync system journal: %m");
+                        log_error_errno(r, "Failed to sync system journal: %m");
         }
 
         ORDERED_HASHMAP_FOREACH_KEY(f, k, s->user_journals, i) {
                 r = journal_file_set_offline(f);
                 if (r < 0)
-                        log_error_errno(-r, "Failed to sync user journal: %m");
+                        log_error_errno(r, "Failed to sync user journal: %m");
         }
 
         if (s->sync_event_source) {
                 r = sd_event_source_set_enabled(s->sync_event_source, SD_EVENT_OFF);
                 if (r < 0)
-                        log_error_errno(-r, "Failed to disable sync timer source: %m");
+                        log_error_errno(r, "Failed to disable sync timer source: %m");
         }
 
         s->sync_scheduled = false;
@@ -377,7 +377,7 @@ static void do_vacuum(Server *s, char *ids, JournalFile *f, const char* path,
         p = strappenda(path, ids);
         r = journal_directory_vacuum(p, metrics->max_use, s->max_retention_usec, &s->oldest_file_usec, false);
         if (r < 0 && r != -ENOENT)
-                log_error_errno(-r, "Failed to vacuum %s: %m", p);
+                log_error_errno(r, "Failed to vacuum %s: %m", p);
 }
 
 void server_vacuum(Server *s) {
@@ -391,7 +391,7 @@ void server_vacuum(Server *s) {
 
         r = sd_id128_get_machine(&machine);
         if (r < 0) {
-                log_error_errno(-r, "Failed to get machine ID: %m");
+                log_error_errno(r, "Failed to get machine ID: %m");
                 return;
         }
         sd_id128_to_string(machine, ids);
@@ -511,7 +511,7 @@ static void write_to_journal(Server *s, uid_t uid, struct iovec *iovec, unsigned
                 for (i = 0; i < n; i++)
                         size += iovec[i].iov_len;
 
-                log_error_errno(-r, "Failed to write entry (%d items, %zu bytes), ignoring: %m", n, size);
+                log_error_errno(r, "Failed to write entry (%d items, %zu bytes), ignoring: %m", n, size);
                 return;
         }
 
@@ -530,7 +530,7 @@ static void write_to_journal(Server *s, uid_t uid, struct iovec *iovec, unsigned
                 for (i = 0; i < n; i++)
                         size += iovec[i].iov_len;
 
-                log_error_errno(-r, "Failed to write entry (%d items, %zu bytes) despite vacuuming, ignoring: %m", n, size);
+                log_error_errno(r, "Failed to write entry (%d items, %zu bytes) despite vacuuming, ignoring: %m", n, size);
         } else
                 server_schedule_sync(s, priority);
 }
@@ -928,7 +928,7 @@ static int system_journal_open(Server *s, bool flush_requested) {
 
         r = sd_id128_get_machine(&machine);
         if (r < 0) {
-                log_error_errno(-r, "Failed to get machine id: %m");
+                log_error_errno(r, "Failed to get machine id: %m");
                 return r;
         }
 
@@ -958,7 +958,7 @@ static int system_journal_open(Server *s, bool flush_requested) {
                         server_fix_perms(s, s->system_journal, 0);
                 else if (r < 0) {
                         if (r != -ENOENT && r != -EROFS)
-                                log_warning_errno(-r, "Failed to open system journal: %m");
+                                log_warning_errno(r, "Failed to open system journal: %m");
 
                         r = 0;
                 }
@@ -982,7 +982,7 @@ static int system_journal_open(Server *s, bool flush_requested) {
 
                         if (r < 0) {
                                 if (r != -ENOENT)
-                                        log_warning_errno(-r, "Failed to open runtime journal: %m");
+                                        log_warning_errno(r, "Failed to open runtime journal: %m");
 
                                 r = 0;
                         }
@@ -1000,7 +1000,7 @@ static int system_journal_open(Server *s, bool flush_requested) {
                         free(fn);
 
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to open runtime journal: %m");
+                                log_error_errno(r, "Failed to open runtime journal: %m");
                                 return r;
                         }
                 }
@@ -1046,7 +1046,7 @@ int server_flush_to_var(Server *s) {
 
         r = sd_journal_open(&j, SD_JOURNAL_RUNTIME_ONLY);
         if (r < 0) {
-                log_error_errno(-r, "Failed to read runtime journal: %m");
+                log_error_errno(r, "Failed to read runtime journal: %m");
                 return r;
         }
 
@@ -1063,7 +1063,7 @@ int server_flush_to_var(Server *s) {
 
                 r = journal_file_move_to_object(f, OBJECT_ENTRY, f->current_offset, &o);
                 if (r < 0) {
-                        log_error_errno(-r, "Can't read entry: %m");
+                        log_error_errno(r, "Can't read entry: %m");
                         goto finish;
                 }
 
@@ -1072,7 +1072,7 @@ int server_flush_to_var(Server *s) {
                         continue;
 
                 if (!shall_try_append_again(s->system_journal, r)) {
-                        log_error_errno(-r, "Can't write entry: %m");
+                        log_error_errno(r, "Can't write entry: %m");
                         goto finish;
                 }
 
@@ -1088,7 +1088,7 @@ int server_flush_to_var(Server *s) {
                 log_debug("Retrying write.");
                 r = journal_file_copy_entry(f, s->system_journal, o, f->current_offset, NULL, NULL, NULL);
                 if (r < 0) {
-                        log_error_errno(-r, "Can't write entry: %m");
+                        log_error_errno(r, "Can't write entry: %m");
                         goto finish;
                 }
         }
@@ -1311,7 +1311,7 @@ static int server_parse_proc_cmdline(Server *s) {
 
         r = proc_cmdline(&line);
         if (r < 0) {
-                log_warning_errno(-r, "Failed to read /proc/cmdline, ignoring: %m");
+                log_warning_errno(r, "Failed to read /proc/cmdline, ignoring: %m");
                 return 0;
         }
 
@@ -1453,13 +1453,13 @@ static int server_open_hostname(Server *s) {
                         return 0;
                 }
 
-                log_error_errno(-r, "Failed to register hostname fd in event loop: %m");
+                log_error_errno(r, "Failed to register hostname fd in event loop: %m");
                 return r;
         }
 
         r = sd_event_source_set_priority(s->hostname_event_source, SD_EVENT_PRIORITY_IMPORTANT-10);
         if (r < 0) {
-                log_error_errno(-r, "Failed to adjust priority of host name event source: %m");
+                log_error_errno(r, "Failed to adjust priority of host name event source: %m");
                 return r;
         }
 
@@ -1515,7 +1515,7 @@ int server_init(Server *s) {
 
         r = sd_event_default(&s->event);
         if (r < 0) {
-                log_error_errno(-r, "Failed to create event loop: %m");
+                log_error_errno(r, "Failed to create event loop: %m");
                 return r;
         }
 
@@ -1523,7 +1523,7 @@ int server_init(Server *s) {
 
         n = sd_listen_fds(true);
         if (n < 0) {
-                log_error_errno(-n, "Failed to read listening file descriptors from environment: %m");
+                log_error_errno(n, "Failed to read listening file descriptors from environment: %m");
                 return n;
         }
 

src/journal/journald-stream.c

@@ -408,13 +408,13 @@ static int stdout_stream_new(sd_event_source *es, int listen_fd, uint32_t revent
 
         r = sd_event_add_io(s->event, &stream->event_source, fd, EPOLLIN, stdout_stream_process, stream);
         if (r < 0) {
-                log_error_errno(-r, "Failed to add stream to event loop: %m");
+                log_error_errno(r, "Failed to add stream to event loop: %m");
                 goto fail;
         }
 
         r = sd_event_source_set_priority(stream->event_source, SD_EVENT_PRIORITY_NORMAL+5);
         if (r < 0) {
-                log_error_errno(-r, "Failed to adjust stdout event source priority: %m");
+                log_error_errno(r, "Failed to adjust stdout event source priority: %m");
                 goto fail;
         }
 
@@ -465,13 +465,13 @@ int server_open_stdout_socket(Server *s) {
 
         r = sd_event_add_io(s->event, &s->stdout_event_source, s->stdout_fd, EPOLLIN, stdout_stream_new, s);
         if (r < 0) {
-                log_error_errno(-r, "Failed to add stdout server fd to event source: %m");
+                log_error_errno(r, "Failed to add stdout server fd to event source: %m");
                 return r;
         }
 
         r = sd_event_source_set_priority(s->stdout_event_source, SD_EVENT_PRIORITY_NORMAL+10);
         if (r < 0) {
-                log_error_errno(-r, "Failed to adjust priority of stdout server event source: %m");
+                log_error_errno(r, "Failed to adjust priority of stdout server event source: %m");
                 return r;
         }
 

src/journal/journald-syslog.c

@@ -467,7 +467,7 @@ int server_open_syslog_socket(Server *s) {
 
         r = sd_event_add_io(s->event, &s->syslog_event_source, s->syslog_fd, EPOLLIN, process_datagram, s);
         if (r < 0) {
-                log_error_errno(-r, "Failed to add syslog server fd to event loop: %m");
+                log_error_errno(r, "Failed to add syslog server fd to event loop: %m");
                 return r;
         }
 

src/journal/journald-wall.c

@@ -65,5 +65,5 @@ void server_forward_wall(
 
         r = utmp_wall(l, "systemd-journald", NULL);
         if (r < 0)
-                log_debug_errno(-r, "Failed to send wall message: %m");
+                log_debug_errno(r, "Failed to send wall message: %m");
 }

src/journal/journald.c

@@ -104,7 +104,7 @@ int main(int argc, char *argv[]) {
 
                 r = sd_event_run(server.event, t);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to run event loop: %m");
+                        log_error_errno(r, "Failed to run event loop: %m");
                         goto finish;
                 }
 

src/journal/sd-journal.c

@@ -884,7 +884,7 @@ static int real_journal_next(sd_journal *j, direction_t direction) {
 
                 r = next_beyond_location(j, f, direction, &o, &p);
                 if (r < 0) {
-                        log_debug_errno(-r, "Can't iterate through %s, ignoring: %m", f->path);
+                        log_debug_errno(r, "Can't iterate through %s, ignoring: %m", f->path);
                         remove_file_real(j, f);
                         continue;
                 } else if (r == 0)
@@ -1567,7 +1567,7 @@ static int add_root_directory(sd_journal *j, const char *p) {
 
                         r = add_directory(j, m->path, de->d_name);
                         if (r < 0)
-                                log_debug_errno(-r, "Failed to add directory %s/%s: %m", m->path, de->d_name);
+                                log_debug_errno(r, "Failed to add directory %s/%s: %m", m->path, de->d_name);
                 }
         }
 
@@ -1810,7 +1810,7 @@ _public_ int sd_journal_open_files(sd_journal **ret, const char **paths, int fla
         STRV_FOREACH(path, paths) {
                 r = add_any_file(j, *path);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to open %s: %m", *path);
+                        log_error_errno(r, "Failed to open %s: %m", *path);
                         goto fail;
                 }
         }
@@ -2227,7 +2227,7 @@ static void process_inotify_event(sd_journal *j, struct inotify_event *e) {
 
                                 r = remove_file(j, d->path, e->name);
                                 if (r < 0)
-                                        log_debug_errno(-r, "Failed to remove file %s/%s: %m", d->path, e->name);
+                                        log_debug_errno(r, "Failed to remove file %s/%s: %m", d->path, e->name);
                         }
 
                 } else if (!d->is_root && e->len == 0) {
@@ -2237,7 +2237,7 @@ static void process_inotify_event(sd_journal *j, struct inotify_event *e) {
                         if (e->mask & (IN_DELETE_SELF|IN_MOVE_SELF|IN_UNMOUNT)) {
                                 r = remove_directory(j, d);
                                 if (r < 0)
-                                        log_debug_errno(-r, "Failed to remove directory %s: %m", d->path);
+                                        log_debug_errno(r, "Failed to remove directory %s: %m", d->path);
                         }
 
 
@@ -2248,7 +2248,7 @@ static void process_inotify_event(sd_journal *j, struct inotify_event *e) {
                         if (e->mask & (IN_CREATE|IN_MOVED_TO|IN_MODIFY|IN_ATTRIB)) {
                                 r = add_directory(j, d->path, e->name);
                                 if (r < 0)
-                                        log_debug_errno(-r, "Failed to add directory %s/%s: %m", d->path, e->name);
+                                        log_debug_errno(r, "Failed to add directory %s/%s: %m", d->path, e->name);
                         }
                 }
 

src/journal/test-compress.c

@@ -63,7 +63,7 @@ static void test_compress_decompress(int compression,
 
         r = compress(data, data_len, compressed, &csize);
         if (r == -ENOBUFS) {
-                log_info_errno(-r, "compression failed: %m");
+                log_info_errno(r, "compression failed: %m");
                 assert(may_fail);
         } else {
                 assert(r == 0);
@@ -108,7 +108,7 @@ static void test_decompress_startswith(int compression,
 
         r = compress(data, data_len, compressed, &csize);
         if (r == -ENOBUFS) {
-                log_info_errno(-r, "compression failed: %m");
+                log_info_errno(r, "compression failed: %m");
                 assert(may_fail);
                 return;
         }

src/libsystemd-network/sd-dhcp-lease.c

@@ -685,7 +685,7 @@ int sd_dhcp_lease_save(sd_dhcp_lease *lease, const char *lease_file) {
 
 finish:
         if (r < 0)
-                log_error_errno(-r, "Failed to save lease data %s: %m", lease_file);
+                log_error_errno(r, "Failed to save lease data %s: %m", lease_file);
 
         return r;
 }
@@ -725,7 +725,7 @@ int sd_dhcp_lease_load(sd_dhcp_lease **ret, const char *lease_file) {
                 if (r == -ENOENT)
                         return 0;
 
-                log_error_errno(-r, "Failed to read %s: %m", lease_file);
+                log_error_errno(r, "Failed to read %s: %m", lease_file);
                 return r;
         }
 

src/libsystemd-network/sd-pppoe.c

@@ -422,7 +422,7 @@ static int pppoe_timeout(sd_event_source *s, uint64_t usec, void *userdata) {
         case PPPOE_STATE_INITIALIZING:
                 r = pppoe_send_initiation(ppp);
                 if (r < 0)
-                        log_warning_errno(-r, "PPPoE: sending PADI failed: %m");
+                        log_warning_errno(r, "PPPoE: sending PADI failed: %m");
 
                 break;
         case PPPOE_STATE_REQUESTING:
@@ -431,14 +431,14 @@ static int pppoe_timeout(sd_event_source *s, uint64_t usec, void *userdata) {
 
                         r = pppoe_send_initiation(ppp);
                         if (r < 0)
-                                log_warning_errno(-r, "PPPoE: sending PADI failed: %m");
+                                log_warning_errno(r, "PPPoE: sending PADI failed: %m");
 
                         ppp->padr_resend_count = PPPOE_MAX_PADR_RESEND;
                         ppp->state = PPPOE_STATE_INITIALIZING;
                 } else {
                         r = pppoe_send_request(ppp);
                         if (r < 0)
-                                log_warning_errno(-r, "PPPoE: sending PADR failed: %m");
+                                log_warning_errno(r, "PPPoE: sending PADR failed: %m");
                 }
 
                 break;
@@ -716,7 +716,7 @@ static int pppoe_receive_message(sd_event_source *s, int fd, uint32_t revents, v
 
         len = recvfrom(fd, packet, buflen, 0, &link.sa, &addrlen);
         if (len < 0) {
-                log_warning_errno(-r, "PPPoE: could not receive message from raw socket: %m");
+                log_warning_errno(r, "PPPoE: could not receive message from raw socket: %m");
                 return 0;
         } else if ((size_t)len < sizeof(struct pppoe_hdr))
                 return 0;

src/libsystemd-terminal/evcat.c

@@ -138,13 +138,13 @@ static int evcat_new(Evcat **out) {
 
         r = sd_pid_get_session(getpid(), &e->session);
         if (r < 0) {
-                log_error_errno(-r, "Cannot retrieve logind session: %m");
+                log_error_errno(r, "Cannot retrieve logind session: %m");
                 return r;
         }
 
         r = sd_session_get_seat(e->session, &e->seat);
         if (r < 0) {
-                log_error_errno(-r, "Cannot retrieve seat of logind session: %m");
+                log_error_errno(r, "Cannot retrieve seat of logind session: %m");
                 return r;
         }
 
@@ -319,14 +319,14 @@ static int evcat_sysview_fn(sysview_context *c, void *userdata, sysview_event *e
                                      evcat_idev_fn,
                                      e);
                 if (r < 0) {
-                        log_error_errno(-r, "Cannot create idev session: %m");
+                        log_error_errno(r, "Cannot create idev session: %m");
                         return r;
                 }
 
                 if (e->managed) {
                         r = sysview_session_take_control(ev->session_add.session);
                         if (r < 0) {
-                                log_error_errno(-r, "Cannot request session control: %m");
+                                log_error_errno(r, "Cannot request session control: %m");
                                 return r;
                         }
                 }
@@ -346,7 +346,7 @@ static int evcat_sysview_fn(sysview_context *c, void *userdata, sysview_event *e
                 if (type == SYSVIEW_DEVICE_EVDEV) {
                         r = idev_session_add_evdev(e->idev_session, sysview_device_get_ud(d));
                         if (r < 0) {
-                                log_error_errno(-r, "Cannot add evdev device to idev: %m");
+                                log_error_errno(r, "Cannot add evdev device to idev: %m");
                                 return r;
                         }
                 }
@@ -358,7 +358,7 @@ static int evcat_sysview_fn(sysview_context *c, void *userdata, sysview_event *e
                 if (type == SYSVIEW_DEVICE_EVDEV) {
                         r = idev_session_remove_evdev(e->idev_session, sysview_device_get_ud(d));
                         if (r < 0) {
-                                log_error_errno(-r, "Cannot remove evdev device from idev: %m");
+                                log_error_errno(r, "Cannot remove evdev device from idev: %m");
                                 return r;
                         }
                 }
@@ -367,7 +367,7 @@ static int evcat_sysview_fn(sysview_context *c, void *userdata, sysview_event *e
         case SYSVIEW_EVENT_SESSION_CONTROL:
                 r = ev->session_control.error;
                 if (r < 0) {
-                        log_error_errno(-r, "Cannot acquire session control: %m");
+                        log_error_errno(r, "Cannot acquire session control: %m");
                         return r;
                 }
 

src/libsystemd-terminal/idev-keyboard.c

@@ -377,7 +377,7 @@ static int kbdctx_set_locale(sd_bus *bus, const char *member, sd_bus_message *m,
 
 error:
         if (r < 0)
-                log_debug_errno(-r, "idev-keyboard: cannot parse locale property from locale1: %m");
+                log_debug_errno(r, "idev-keyboard: cannot parse locale property from locale1: %m");
 
         return r;
 }
@@ -448,7 +448,7 @@ static int kbdctx_query_locale(kbdctx *kc) {
         return 0;
 
 error:
-        log_debug_errno(-r, "idev-keyboard: cannot send GetAll to locale1: %m");
+        log_debug_errno(r, "idev-keyboard: cannot send GetAll to locale1: %m");
         return r;
 }
 
@@ -480,7 +480,7 @@ static int kbdctx_locale_props_changed_fn(sd_bus *bus,
         return 0;
 
 error:
-        log_debug_errno(-r, "idev-keyboard: cannot handle PropertiesChanged from locale1: %m");
+        log_debug_errno(r, "idev-keyboard: cannot handle PropertiesChanged from locale1: %m");
         return r;
 }
 
@@ -497,7 +497,7 @@ static int kbdctx_setup_bus(kbdctx *kc) {
                              kbdctx_locale_props_changed_fn,
                              kc);
         if (r < 0) {
-                log_debug_errno(-r, "idev-keyboard: cannot setup locale1 link: %m");
+                log_debug_errno(r, "idev-keyboard: cannot setup locale1 link: %m");
                 return r;
         }
 

src/libsystemd-terminal/modeset.c

@@ -147,13 +147,13 @@ static int modeset_new(Modeset **out) {
 
         r = sd_pid_get_session(getpid(), &m->session);
         if (r < 0) {
-                log_error_errno(-r, "Cannot retrieve logind session: %m");
+                log_error_errno(r, "Cannot retrieve logind session: %m");
                 return r;
         }
 
         r = sd_session_get_seat(m->session, &m->seat);
         if (r < 0) {
-                log_error_errno(-r, "Cannot retrieve seat of logind session: %m");
+                log_error_errno(r, "Cannot retrieve seat of logind session: %m");
                 return r;
         }
 
@@ -310,14 +310,14 @@ static int modeset_sysview_fn(sysview_context *c, void *userdata, sysview_event
                                       modeset_grdev_fn,
                                       m);
                 if (r < 0) {
-                        log_error_errno(-r, "Cannot create grdev session: %m");
+                        log_error_errno(r, "Cannot create grdev session: %m");
                         return r;
                 }
 
                 if (m->managed) {
                         r = sysview_session_take_control(ev->session_add.session);
                         if (r < 0) {
-                                log_error_errno(-r, "Cannot request session control: %m");
+                                log_error_errno(r, "Cannot request session control: %m");
                                 return r;
                         }
                 }
@@ -359,7 +359,7 @@ static int modeset_sysview_fn(sysview_context *c, void *userdata, sysview_event
         case SYSVIEW_EVENT_SESSION_CONTROL:
                 r = ev->session_control.error;
                 if (r < 0) {
-                        log_error_errno(-r, "Cannot acquire session control: %m");
+                        log_error_errno(r, "Cannot acquire session control: %m");
                         return r;
                 }
 

src/libsystemd-terminal/subterm.c

@@ -126,7 +126,7 @@ static int output_flush(Output *o) {
 
         len = loop_write(o->fd, o->obuf, o->n_obuf, false);
         if (len < 0) {
-                log_error_errno(-len, "error: cannot write to TTY (%zd): %m", len);
+                log_error_errno(len, "error: cannot write to TTY (%zd): %m", len);
                 return len;
         }
 
@@ -157,7 +157,7 @@ static int output_write(Output *o, const void *buf, size_t size) {
 
         len = loop_write(o->fd, buf, size, false);
         if (len < 0) {
-                log_error_errno(-len, "error: cannot write to TTY (%zd): %m", len);
+                log_error_errno(len, "error: cannot write to TTY (%zd): %m", len);
                 return len;
         }
 
@@ -612,12 +612,12 @@ static int terminal_winch_fn(sd_event_source *source, const struct signalfd_sigi
         if (t->pty) {
                 r = pty_resize(t->pty, t->output->in_width, t->output->in_height);
                 if (r < 0)
-                        log_error_errno(-r, "error: pty_resize() (%d): %m", r);
+                        log_error_errno(r, "error: pty_resize() (%d): %m", r);
         }
 
         r = term_screen_resize(t->screen, t->output->in_width, t->output->in_height);
         if (r < 0)
-                log_error_errno(-r, "error: term_screen_resize() (%d): %m", r);
+                log_error_errno(r, "error: term_screen_resize() (%d): %m", r);
 
         terminal_dirty(t);
 
@@ -657,7 +657,7 @@ static int terminal_write_tmp(Terminal *t) {
                 for (i = 0; i < num; ++i) {
                         r = pty_write(t->pty, vec[i].iov_base, vec[i].iov_len);
                         if (r < 0) {
-                                log_error_errno(-r, "error: cannot write to PTY (%d): %m", r);
+                                log_error_errno(r, "error: cannot write to PTY (%d): %m", r);
                                 return r;
                         }
                 }
@@ -726,7 +726,7 @@ static int terminal_io_fn(sd_event_source *source, int fd, uint32_t revents, voi
                 for (j = 0; j < n_str; ++j) {
                         type = term_parser_feed(t->parser, &seq, str[j]);
                         if (type < 0) {
-                                log_error_errno(-type, "error: term_parser_feed() (%d): %m", type);
+                                log_error_errno(type, "error: term_parser_feed() (%d): %m", type);
                                 return type;
                         }
 
@@ -778,7 +778,7 @@ static int terminal_pty_fn(Pty *pty, void *userdata, unsigned int event, const v
         case PTY_DATA:
                 r = term_screen_feed_text(t->screen, ptr, size);
                 if (r < 0) {
-                        log_error_errno(-r, "error: term_screen_feed_text() (%d): %m", r);
+                        log_error_errno(r, "error: term_screen_feed_text() (%d): %m", r);
                         return r;
                 }
 
@@ -857,49 +857,49 @@ static int terminal_new(Terminal **out, int in_fd, int out_fd) {
 
         r = tcsetattr(t->in_fd, TCSANOW, &in_attr);
         if (r < 0) {
-                log_error_errno(-r, "error: tcsetattr() (%d): %m", r);
+                log_error_errno(r, "error: tcsetattr() (%d): %m", r);
                 goto error;
         }
 
         r = tcsetattr(t->out_fd, TCSANOW, &out_attr);
         if (r < 0) {
-                log_error_errno(-r, "error: tcsetattr() (%d): %m", r);
+                log_error_errno(r, "error: tcsetattr() (%d): %m", r);
                 goto error;
         }
 
         r = sd_event_default(&t->event);
         if (r < 0) {
-                log_error_errno(-r, "error: sd_event_default() (%d): %m", r);
+                log_error_errno(r, "error: sd_event_default() (%d): %m", r);
                 goto error;
         }
 
         r = sigprocmask_many(SIG_BLOCK, SIGINT, SIGQUIT, SIGTERM, SIGWINCH, SIGCHLD, -1);
         if (r < 0) {
-                log_error_errno(-r, "error: sigprocmask_many() (%d): %m", r);
+                log_error_errno(r, "error: sigprocmask_many() (%d): %m", r);
                 goto error;
         }
 
         r = sd_event_add_signal(t->event, NULL, SIGINT, NULL, NULL);
         if (r < 0) {
-                log_error_errno(-r, "error: sd_event_add_signal() (%d): %m", r);
+                log_error_errno(r, "error: sd_event_add_signal() (%d): %m", r);
                 goto error;
         }
 
         r = sd_event_add_signal(t->event, NULL, SIGQUIT, NULL, NULL);
         if (r < 0) {
-                log_error_errno(-r, "error: sd_event_add_signal() (%d): %m", r);
+                log_error_errno(r, "error: sd_event_add_signal() (%d): %m", r);
                 goto error;
         }
 
         r = sd_event_add_signal(t->event, NULL, SIGTERM, NULL, NULL);
         if (r < 0) {
-                log_error_errno(-r, "error: sd_event_add_signal() (%d): %m", r);
+                log_error_errno(r, "error: sd_event_add_signal() (%d): %m", r);
                 goto error;
         }
 
         r = sd_event_add_signal(t->event, NULL, SIGWINCH, terminal_winch_fn, t);
         if (r < 0) {
-                log_error_errno(-r, "error: sd_event_add_signal() (%d): %m", r);
+                log_error_errno(r, "error: sd_event_add_signal() (%d): %m", r);
                 goto error;
         }
 
@@ -907,7 +907,7 @@ static int terminal_new(Terminal **out, int in_fd, int out_fd) {
         t->is_dirty = true;
         r = sd_event_add_time(t->event, &t->frame_timer, CLOCK_MONOTONIC, 0, 0, terminal_frame_timer_fn, t);
         if (r < 0) {
-                log_error_errno(-r, "error: sd_event_add_time() (%d): %m", r);
+                log_error_errno(r, "error: sd_event_add_time() (%d): %m", r);
                 goto error;
         }
 
@@ -929,7 +929,7 @@ static int terminal_new(Terminal **out, int in_fd, int out_fd) {
 
         r = term_screen_resize(t->screen, t->output->in_width, t->output->in_height);
         if (r < 0) {
-                log_error_errno(-r, "error: term_screen_resize() (%d): %m", r);
+                log_error_errno(r, "error: term_screen_resize() (%d): %m", r);
                 goto error;
         }
 
@@ -952,7 +952,7 @@ static int terminal_run(Terminal *t) {
 
         pid = pty_fork(&t->pty, t->event, terminal_pty_fn, t, t->output->in_width, t->output->in_height);
         if (pid < 0) {
-                log_error_errno(-pid, "error: cannot fork PTY (%d): %m", pid);
+                log_error_errno(pid, "error: cannot fork PTY (%d): %m", pid);
                 return pid;
         } else if (pid == 0) {
                 /* child */
@@ -993,7 +993,7 @@ int main(int argc, char *argv[]) {
 
 out:
         if (r < 0)
-                log_error_errno(-r, "error: terminal failed (%d): %m", r);
+                log_error_errno(r, "error: terminal failed (%d): %m", r);
         terminal_free(t);
         return -r;
 }

src/libsystemd-terminal/sysview.c

@@ -1498,7 +1498,7 @@ static int context_scan_fn(sd_event_source *s, void *userdata) {
         if (!c->scanned) {
                 r = context_ld_scan(c);
                 if (r < 0) {
-                        log_debug_errno(-r, "sysview: logind scan failed: %m");
+                        log_debug_errno(r, "sysview: logind scan failed: %m");
                         return r;
                 }
         }
@@ -1507,7 +1507,7 @@ static int context_scan_fn(sd_event_source *s, void *userdata) {
         if (hashmap_size(c->session_map) > 0) {
                 r = context_ud_scan(c);
                 if (r < 0) {
-                        log_debug_errno(-r, "sysview: udev scan failed: %m");
+                        log_debug_errno(r, "sysview: udev scan failed: %m");
                         return r;
                 }
 

src/libsystemd/sd-bus/bus-dump.c

@@ -126,7 +126,7 @@ int bus_message_dump(sd_bus_message *m, FILE *f, unsigned flags) {
 
         r = sd_bus_message_rewind(m, !(flags & BUS_MESSAGE_DUMP_SUBTREE_ONLY));
         if (r < 0) {
-                log_error_errno(-r, "Failed to rewind: %m");
+                log_error_errno(r, "Failed to rewind: %m");
                 return r;
         }
 
@@ -152,7 +152,7 @@ int bus_message_dump(sd_bus_message *m, FILE *f, unsigned flags) {
 
                 r = sd_bus_message_peek_type(m, &type, &contents);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to peek type: %m");
+                        log_error_errno(r, "Failed to peek type: %m");
                         return r;
                 }
 
@@ -162,7 +162,7 @@ int bus_message_dump(sd_bus_message *m, FILE *f, unsigned flags) {
 
                         r = sd_bus_message_exit_container(m);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to exit container: %m");
+                                log_error_errno(r, "Failed to exit container: %m");
                                 return r;
                         }
 
@@ -183,7 +183,7 @@ int bus_message_dump(sd_bus_message *m, FILE *f, unsigned flags) {
                 if (bus_type_is_container(type) > 0) {
                         r = sd_bus_message_enter_container(m, type, contents);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to enter container: %m");
+                                log_error_errno(r, "Failed to enter container: %m");
                                 return r;
                         }
 
@@ -203,7 +203,7 @@ int bus_message_dump(sd_bus_message *m, FILE *f, unsigned flags) {
 
                 r = sd_bus_message_read_basic(m, type, &basic);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to get basic: %m");
+                        log_error_errno(r, "Failed to get basic: %m");
                         return r;
                 }
 

src/libsystemd/sd-bus/bus-kernel.c

@@ -1059,7 +1059,7 @@ int bus_kernel_write_message(sd_bus *bus, sd_bus_message *m, bool hint_sync_call
 
                                 /* Anybody can send us invalid messages, let's just drop them. */
                                 if (r == -EBADMSG || r == -EPROTOTYPE)
-                                        log_debug_errno(-r, "Ignoring invalid message: %m");
+                                        log_debug_errno(r, "Ignoring invalid message: %m");
                                 else
                                         return r;
                         }
@@ -1243,7 +1243,7 @@ int bus_kernel_read_message(sd_bus *bus, bool hint_priority, int64_t priority) {
 
                 /* Anybody can send us invalid messages, let's just drop them. */
                 if (r == -EBADMSG || r == -EPROTOTYPE) {
-                        log_debug_errno(-r, "Ignoring invalid message: %m");
+                        log_debug_errno(r, "Ignoring invalid message: %m");
                         r = 0;
                 }
 

src/libsystemd/sd-bus/bus-track.c

@@ -309,7 +309,7 @@ void bus_track_dispatch(sd_bus_track *track) {
 
         r = track->handler(track, track->userdata);
         if (r < 0)
-                log_debug_errno(-r, "Failed to process track handler: %m");
+                log_debug_errno(r, "Failed to process track handler: %m");
         else if (r == 0)
                 bus_track_add_to_queue(track);
 

src/libsystemd/sd-bus/bus-util.c

@@ -1263,12 +1263,12 @@ int bus_property_get_ulong(
 #endif
 
 int bus_log_parse_error(int r) {
-        log_error_errno(-r, "Failed to parse bus message: %m");
+        log_error_errno(r, "Failed to parse bus message: %m");
         return r;
 }
 
 int bus_log_create_error(int r) {
-        log_error_errno(-r, "Failed to create bus message: %m");
+        log_error_errno(r, "Failed to create bus message: %m");
         return r;
 }
 

src/libsystemd/sd-bus/busctl.c

@@ -90,7 +90,7 @@ static int list_bus_names(sd_bus *bus, char **argv) {
 
         r = sd_bus_list_names(bus, (arg_acquired || arg_unique) ? &acquired : NULL, arg_activatable ? &activatable : NULL);
         if (r < 0) {
-                log_error_errno(-r, "Failed to list names: %m");
+                log_error_errno(r, "Failed to list names: %m");
                 return r;
         }
 
@@ -105,7 +105,7 @@ static int list_bus_names(sd_bus *bus, char **argv) {
 
                 r = hashmap_put(names, *i, NAME_IS_ACQUIRED);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to add to hashmap: %m");
+                        log_error_errno(r, "Failed to add to hashmap: %m");
                         return r;
                 }
         }
@@ -115,7 +115,7 @@ static int list_bus_names(sd_bus *bus, char **argv) {
 
                 r = hashmap_put(names, *i, NAME_IS_ACTIVATABLE);
                 if (r < 0 && r != -EEXIST) {
-                        log_error_errno(-r, "Failed to add to hashmap: %m");
+                        log_error_errno(r, "Failed to add to hashmap: %m");
                         return r;
                 }
         }
@@ -439,7 +439,7 @@ static int tree(sd_bus *bus, char **argv) {
 
                 r = sd_bus_list_names(bus, &names, NULL);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to get name list: %m");
+                        log_error_errno(r, "Failed to get name list: %m");
                         return r;
                 }
 
@@ -1096,7 +1096,7 @@ static int monitor(sd_bus *bus, char *argv[], int (*dump)(sd_bus_message *m, FIL
 
                 r = sd_bus_add_match(bus, NULL, m, NULL, NULL);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to add match: %m");
+                        log_error_errno(r, "Failed to add match: %m");
                         return r;
                 }
 
@@ -1106,7 +1106,7 @@ static int monitor(sd_bus *bus, char *argv[], int (*dump)(sd_bus_message *m, FIL
         STRV_FOREACH(i, arg_matches) {
                 r = sd_bus_add_match(bus, NULL, *i, NULL, NULL);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to add match: %m");
+                        log_error_errno(r, "Failed to add match: %m");
                         return r;
                 }
 
@@ -1116,7 +1116,7 @@ static int monitor(sd_bus *bus, char *argv[], int (*dump)(sd_bus_message *m, FIL
         if (!added_something) {
                 r = sd_bus_add_match(bus, NULL, "", NULL, NULL);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to add match: %m");
+                        log_error_errno(r, "Failed to add match: %m");
                         return r;
                 }
         }
@@ -1126,7 +1126,7 @@ static int monitor(sd_bus *bus, char *argv[], int (*dump)(sd_bus_message *m, FIL
 
                 r = sd_bus_process(bus, &m);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to process bus: %m");
+                        log_error_errno(r, "Failed to process bus: %m");
                         return r;
                 }
 
@@ -1140,7 +1140,7 @@ static int monitor(sd_bus *bus, char *argv[], int (*dump)(sd_bus_message *m, FIL
 
                 r = sd_bus_wait(bus, (uint64_t) -1);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to wait for bus: %m");
+                        log_error_errno(r, "Failed to wait for bus: %m");
                         return r;
                 }
         }
@@ -1200,7 +1200,7 @@ static int status(sd_bus *bus, char *argv[]) {
                                 &creds);
 
         if (r < 0) {
-                log_error_errno(-r, "Failed to get credentials: %m");
+                log_error_errno(r, "Failed to get credentials: %m");
                 return r;
         }
 
@@ -1962,7 +1962,7 @@ int main(int argc, char *argv[]) {
 
         r = sd_bus_new(&bus);
         if (r < 0) {
-                log_error_errno(-r, "Failed to allocate bus: %m");
+                log_error_errno(r, "Failed to allocate bus: %m");
                 goto finish;
         }
 
@@ -1971,25 +1971,25 @@ int main(int argc, char *argv[]) {
 
                 r = sd_bus_set_monitor(bus, true);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to set monitor mode: %m");
+                        log_error_errno(r, "Failed to set monitor mode: %m");
                         goto finish;
                 }
 
                 r = sd_bus_negotiate_creds(bus, true, _SD_BUS_CREDS_ALL);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to enable credentials: %m");
+                        log_error_errno(r, "Failed to enable credentials: %m");
                         goto finish;
                 }
 
                 r = sd_bus_negotiate_timestamp(bus, true);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to enable timestamps: %m");
+                        log_error_errno(r, "Failed to enable timestamps: %m");
                         goto finish;
                 }
 
                 r = sd_bus_negotiate_fds(bus, true);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to enable fds: %m");
+                        log_error_errno(r, "Failed to enable fds: %m");
                         goto finish;
                 }
         }
@@ -1999,7 +1999,7 @@ int main(int argc, char *argv[]) {
         else {
                 r = sd_bus_set_bus_client(bus, true);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to set bus client: %m");
+                        log_error_errno(r, "Failed to set bus client: %m");
                         goto finish;
                 }
 
@@ -2025,13 +2025,13 @@ int main(int argc, char *argv[]) {
                 }
         }
         if (r < 0) {
-                log_error_errno(-r, "Failed to set address: %m");
+                log_error_errno(r, "Failed to set address: %m");
                 goto finish;
         }
 
         r = sd_bus_start(bus);
         if (r < 0) {
-                log_error_errno(-r, "Failed to connect to bus: %m");
+                log_error_errno(r, "Failed to connect to bus: %m");
                 goto finish;
         }
 

src/libsystemd/sd-bus/test-bus-chat.c

@@ -54,7 +54,7 @@ static int object_callback(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bu
 
                 r = sd_bus_reply_method_return(m, NULL);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to send reply: %m");
+                        log_error_errno(r, "Failed to send reply: %m");
                         return r;
                 }
 
@@ -74,19 +74,19 @@ static int server_init(sd_bus **_bus) {
 
         r = sd_bus_open_user(&bus);
         if (r < 0) {
-                log_error_errno(-r, "Failed to connect to user bus: %m");
+                log_error_errno(r, "Failed to connect to user bus: %m");
                 goto fail;
         }
 
         r = sd_bus_get_owner_id(bus, &id);
         if (r < 0) {
-                log_error_errno(-r, "Failed to get server ID: %m");
+                log_error_errno(r, "Failed to get server ID: %m");
                 goto fail;
         }
 
         r = sd_bus_get_unique_name(bus, &unique);
         if (r < 0) {
-                log_error_errno(-r, "Failed to get unique name: %m");
+                log_error_errno(r, "Failed to get unique name: %m");
                 goto fail;
         }
 
@@ -96,25 +96,25 @@ static int server_init(sd_bus **_bus) {
 
         r = sd_bus_request_name(bus, "org.freedesktop.systemd.test", 0);
         if (r < 0) {
-                log_error_errno(-r, "Failed to acquire name: %m");
+                log_error_errno(r, "Failed to acquire name: %m");
                 goto fail;
         }
 
         r = sd_bus_add_fallback(bus, NULL, "/foo/bar", object_callback, NULL);
         if (r < 0) {
-                log_error_errno(-r, "Failed to add object: %m");
+                log_error_errno(r, "Failed to add object: %m");
                 goto fail;
         }
 
         r = sd_bus_add_match(bus, NULL, "type='signal',interface='foo.bar',member='Notify'", match_callback, NULL);
         if (r < 0) {
-                log_error_errno(-r, "Failed to add match: %m");
+                log_error_errno(r, "Failed to add match: %m");
                 goto fail;
         }
 
         r = sd_bus_add_match(bus, NULL, "type='signal',interface='org.freedesktop.DBus',member='NameOwnerChanged'", match_callback, NULL);
         if (r < 0) {
-                log_error_errno(-r, "Failed to add match: %m");
+                log_error_errno(r, "Failed to add match: %m");
                 goto fail;
         }
 
@@ -141,14 +141,14 @@ static int server(sd_bus *bus) {
 
                 r = sd_bus_process(bus, &m);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to process requests: %m");
+                        log_error_errno(r, "Failed to process requests: %m");
                         goto fail;
                 }
 
                 if (r == 0) {
                         r = sd_bus_wait(bus, (uint64_t) -1);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to wait: %m");
+                                log_error_errno(r, "Failed to wait: %m");
                                 goto fail;
                         }
 
@@ -173,7 +173,7 @@ static int server(sd_bus *bus) {
 
                         r = sd_bus_message_read(m, "s", &hello);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to get parameter: %m");
+                                log_error_errno(r, "Failed to get parameter: %m");
                                 goto fail;
                         }
 
@@ -187,14 +187,14 @@ static int server(sd_bus *bus) {
 
                         r = sd_bus_reply_method_return(m, "s", lowercase);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to send reply: %m");
+                                log_error_errno(r, "Failed to send reply: %m");
                                 goto fail;
                         }
                 } else if (sd_bus_message_is_method_call(m, "org.freedesktop.systemd.test", "ExitClient1")) {
 
                         r = sd_bus_reply_method_return(m, NULL);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to send reply: %m");
+                                log_error_errno(r, "Failed to send reply: %m");
                                 goto fail;
                         }
 
@@ -203,7 +203,7 @@ static int server(sd_bus *bus) {
 
                         r = sd_bus_reply_method_return(m, NULL);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to send reply: %m");
+                                log_error_errno(r, "Failed to send reply: %m");
                                 goto fail;
                         }
 
@@ -214,7 +214,7 @@ static int server(sd_bus *bus) {
 
                         r = sd_bus_reply_method_return(m, NULL);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to send reply: %m");
+                                log_error_errno(r, "Failed to send reply: %m");
                                 goto fail;
                         }
 
@@ -224,7 +224,7 @@ static int server(sd_bus *bus) {
 
                         r = sd_bus_message_read(m, "h", &fd);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to get parameter: %m");
+                                log_error_errno(r, "Failed to get parameter: %m");
                                 goto fail;
                         }
 
@@ -238,7 +238,7 @@ static int server(sd_bus *bus) {
 
                         r = sd_bus_reply_method_return(m, NULL);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to send reply: %m");
+                                log_error_errno(r, "Failed to send reply: %m");
                                 goto fail;
                         }
 
@@ -248,7 +248,7 @@ static int server(sd_bus *bus) {
                                         m,
                                         &SD_BUS_ERROR_MAKE_CONST(SD_BUS_ERROR_UNKNOWN_METHOD, "Unknown method."));
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to send reply: %m");
+                                log_error_errno(r, "Failed to send reply: %m");
                                 goto fail;
                         }
                 }
@@ -276,7 +276,7 @@ static void* client1(void*p) {
 
         r = sd_bus_open_user(&bus);
         if (r < 0) {
-                log_error_errno(-r, "Failed to connect to user bus: %m");
+                log_error_errno(r, "Failed to connect to user bus: %m");
                 goto finish;
         }
 
@@ -291,13 +291,13 @@ static void* client1(void*p) {
                         "s",
                         "HELLO");
         if (r < 0) {
-                log_error_errno(-r, "Failed to issue method call: %m");
+                log_error_errno(r, "Failed to issue method call: %m");
                 goto finish;
         }
 
         r = sd_bus_message_read(reply, "s", &hello);
         if (r < 0) {
-                log_error_errno(-r, "Failed to get string: %m");
+                log_error_errno(r, "Failed to get string: %m");
                 goto finish;
         }
 
@@ -322,7 +322,7 @@ static void* client1(void*p) {
                         "h",
                         pp[1]);
         if (r < 0) {
-                log_error_errno(-r, "Failed to issue method call: %m");
+                log_error_errno(r, "Failed to issue method call: %m");
                 goto finish;
         }
 
@@ -346,7 +346,7 @@ finish:
                                 "org.freedesktop.systemd.test",
                                 "ExitClient1");
                 if (r < 0)
-                        log_error_errno(-r, "Failed to allocate method call: %m");
+                        log_error_errno(r, "Failed to allocate method call: %m");
                 else
                         sd_bus_send(bus, q, NULL);
 
@@ -380,7 +380,7 @@ static void* client2(void*p) {
 
         r = sd_bus_open_user(&bus);
         if (r < 0) {
-                log_error_errno(-r, "Failed to connect to user bus: %m");
+                log_error_errno(r, "Failed to connect to user bus: %m");
                 goto finish;
         }
 
@@ -392,7 +392,7 @@ static void* client2(void*p) {
                         "org.object.test",
                         "Foobar");
         if (r < 0) {
-                log_error_errno(-r, "Failed to allocate method call: %m");
+                log_error_errno(r, "Failed to allocate method call: %m");
                 goto finish;
         }
 
@@ -412,7 +412,7 @@ static void* client2(void*p) {
                         "foo.bar",
                         "Notify");
         if (r < 0) {
-                log_error_errno(-r, "Failed to allocate signal: %m");
+                log_error_errno(r, "Failed to allocate signal: %m");
                 goto finish;
         }
 
@@ -433,7 +433,7 @@ static void* client2(void*p) {
                         "org.freedesktop.DBus.Peer",
                         "GetMachineId");
         if (r < 0) {
-                log_error_errno(-r, "Failed to allocate method call: %m");
+                log_error_errno(r, "Failed to allocate method call: %m");
                 goto finish;
         }
 
@@ -445,7 +445,7 @@ static void* client2(void*p) {
 
         r = sd_bus_message_read(reply, "s", &mid);
         if (r < 0) {
-                log_error_errno(-r, "Failed to parse machine ID: %m");
+                log_error_errno(r, "Failed to parse machine ID: %m");
                 goto finish;
         }
 
@@ -462,7 +462,7 @@ static void* client2(void*p) {
                         "org.freedesktop.systemd.test",
                         "Slow");
         if (r < 0) {
-                log_error_errno(-r, "Failed to allocate method call: %m");
+                log_error_errno(r, "Failed to allocate method call: %m");
                 goto finish;
         }
 
@@ -486,7 +486,7 @@ static void* client2(void*p) {
                         "org.freedesktop.systemd.test",
                         "Slow");
         if (r < 0) {
-                log_error_errno(-r, "Failed to allocate method call: %m");
+                log_error_errno(r, "Failed to allocate method call: %m");
                 goto finish;
         }
 
@@ -499,13 +499,13 @@ static void* client2(void*p) {
         while (!quit) {
                 r = sd_bus_process(bus, NULL);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to process requests: %m");
+                        log_error_errno(r, "Failed to process requests: %m");
                         goto finish;
                 }
                 if (r == 0) {
                         r = sd_bus_wait(bus, (uint64_t) -1);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to wait: %m");
+                                log_error_errno(r, "Failed to wait: %m");
                                 goto finish;
                         }
                 }
@@ -525,7 +525,7 @@ finish:
                                 "org.freedesktop.systemd.test",
                                 "ExitClient2");
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to allocate method call: %m");
+                        log_error_errno(r, "Failed to allocate method call: %m");
                         goto finish;
                 }
 

src/libsystemd/sd-bus/test-bus-objects.c

@@ -237,14 +237,14 @@ static void *server(void *p) {
 
                 r = sd_bus_process(bus, NULL);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to process requests: %m");
+                        log_error_errno(r, "Failed to process requests: %m");
                         goto fail;
                 }
 
                 if (r == 0) {
                         r = sd_bus_wait(bus, (uint64_t) -1);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to wait: %m");
+                                log_error_errno(r, "Failed to wait: %m");
                                 goto fail;
                         }
 

src/libsystemd/sd-bus/test-bus-server.c

@@ -65,14 +65,14 @@ static void *server(void *p) {
 
                 r = sd_bus_process(bus, &m);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to process requests: %m");
+                        log_error_errno(r, "Failed to process requests: %m");
                         goto fail;
                 }
 
                 if (r == 0) {
                         r = sd_bus_wait(bus, (uint64_t) -1);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to wait: %m");
+                                log_error_errno(r, "Failed to wait: %m");
                                 goto fail;
                         }
 
@@ -90,7 +90,7 @@ static void *server(void *p) {
 
                         r = sd_bus_message_new_method_return(m, &reply);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to allocate return: %m");
+                                log_error_errno(r, "Failed to allocate return: %m");
                                 goto fail;
                         }
 
@@ -102,7 +102,7 @@ static void *server(void *p) {
                                         &reply,
                                         &SD_BUS_ERROR_MAKE_CONST(SD_BUS_ERROR_UNKNOWN_METHOD, "Unknown method."));
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to allocate return: %m");
+                                log_error_errno(r, "Failed to allocate return: %m");
                                 goto fail;
                         }
                 }
@@ -110,7 +110,7 @@ static void *server(void *p) {
                 if (reply) {
                         r = sd_bus_send(bus, reply, NULL);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to send reply: %m");
+                                log_error_errno(r, "Failed to send reply: %m");
                                 goto fail;
                         }
                 }
@@ -147,7 +147,7 @@ static int client(struct context *c) {
                         "org.freedesktop.systemd.test",
                         "Exit");
         if (r < 0) {
-                log_error_errno(-r, "Failed to allocate method call: %m");
+                log_error_errno(r, "Failed to allocate method call: %m");
                 return r;
         }
 

src/libsystemd/sd-event/sd-event.c

@@ -2158,9 +2158,9 @@ static int source_dispatch(sd_event_source *s) {
 
         if (r < 0) {
                 if (s->description)
-                        log_debug_errno(-r, "Event source '%s' returned error, disabling: %m", s->description);
+                        log_debug_errno(r, "Event source '%s' returned error, disabling: %m", s->description);
                 else
-                        log_debug_errno(-r, "Event source %p returned error, disabling: %m", s);
+                        log_debug_errno(r, "Event source %p returned error, disabling: %m", s);
         }
 
         if (s->n_ref == 0)
@@ -2196,9 +2196,9 @@ static int event_prepare(sd_event *e) {
 
                 if (r < 0) {
                         if (s->description)
-                                log_debug_errno(-r, "Prepare callback of event source '%s' returned error, disabling: %m", s->description);
+                                log_debug_errno(r, "Prepare callback of event source '%s' returned error, disabling: %m", s->description);
                         else
-                                log_debug_errno(-r, "Prepare callback of event source %p returned error, disabling: %m", s);
+                                log_debug_errno(r, "Prepare callback of event source %p returned error, disabling: %m", s);
                 }
 
                 if (s->n_ref == 0)

src/libsystemd/sd-rtnl/rtnl-util.c

@@ -157,11 +157,11 @@ bool rtnl_message_type_is_addr(uint16_t type) {
 }
 
 int rtnl_log_parse_error(int r) {
-        log_error_errno(-r, "Failed to parse netlink message: %m");
+        log_error_errno(r, "Failed to parse netlink message: %m");
         return r;
 }
 
 int rtnl_log_create_error(int r) {
-        log_error_errno(-r, "Failed to create netlink message: %m");
+        log_error_errno(r, "Failed to create netlink message: %m");
         return r;
 }

src/libsystemd/sd-rtnl/test-rtnl.c

@@ -135,7 +135,7 @@ static void test_route(void) {
 
         r = sd_rtnl_message_new_route(NULL, &req, RTM_NEWROUTE, AF_INET, RTPROT_STATIC);
         if (r < 0) {
-                log_error_errno(-r, "Could not create RTM_NEWROUTE message: %m");
+                log_error_errno(r, "Could not create RTM_NEWROUTE message: %m");
                 return;
         }
 
@@ -143,13 +143,13 @@ static void test_route(void) {
 
         r = sd_rtnl_message_append_in_addr(req, RTA_GATEWAY, &addr);
         if (r < 0) {
-                log_error_errno(-r, "Could not append RTA_GATEWAY attribute: %m");
+                log_error_errno(r, "Could not append RTA_GATEWAY attribute: %m");
                 return;
         }
 
         r = sd_rtnl_message_append_u32(req, RTA_OIF, index);
         if (r < 0) {
-                log_error_errno(-r, "Could not append RTA_OIF attribute: %m");
+                log_error_errno(r, "Could not append RTA_OIF attribute: %m");
                 return;
         }
 
@@ -223,7 +223,7 @@ static int pipe_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
 
         r = sd_rtnl_message_get_errno(m);
 
-        log_info_errno(-r, "%d left in pipe. got reply: %m", *counter);
+        log_info_errno(r, "%d left in pipe. got reply: %m", *counter);
 
         assert_se(r >= 0);
 

src/locale/localectl.c

@@ -110,7 +110,7 @@ static void print_overriden_variables(void) {
                            NULL);
 
         if (r < 0 && r != -ENOENT) {
-                log_warning_errno(-r, "Failed to read /proc/cmdline: %m");
+                log_warning_errno(r, "Failed to read /proc/cmdline: %m");
                 goto finish;
         }
 
@@ -178,7 +178,7 @@ static int show_status(sd_bus *bus, char **args, unsigned n) {
                                    map,
                                    &info);
         if (r < 0) {
-                log_error_errno(-r, "Could not get properties: %m");
+                log_error_errno(r, "Could not get properties: %m");
                 goto fail;
         }
 
@@ -235,7 +235,7 @@ static int list_locales(sd_bus *bus, char **args, unsigned n) {
 
         r = get_locales(&l);
         if (r < 0) {
-                log_error_errno(-r, "Failed to read list of locales: %m");
+                log_error_errno(r, "Failed to read list of locales: %m");
                 return r;
         }
 
@@ -310,7 +310,7 @@ static int nftw_cb(
 
         r = set_consume(keymaps, p);
         if (r < 0 && r != -EEXIST) {
-                log_error_errno(-r, "Can't add keymap: %m");
+                log_error_errno(r, "Can't add keymap: %m");
                 return r;
         }
 
@@ -683,7 +683,7 @@ int main(int argc, char*argv[]) {
 
         r = bus_open_transport(arg_transport, arg_host, false, &bus);
         if (r < 0) {
-                log_error_errno(-r, "Failed to create bus connection: %m");
+                log_error_errno(r, "Failed to create bus connection: %m");
                 goto finish;
         }
 

src/locale/localed.c

@@ -375,7 +375,7 @@ static int locale_update_system_manager(Context *c, sd_bus *bus) {
 
         r = sd_bus_call(bus, m, 0, &error, NULL);
         if (r < 0)
-                log_error_errno(-r, "Failed to update the manager environment: %m");
+                log_error_errno(r, "Failed to update the manager environment: %m");
 
         return 0;
 }
@@ -611,7 +611,7 @@ static int vconsole_convert_to_x11(Context *c, sd_bus *bus) {
 
                 r = x11_write_data(c);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to set X11 keyboard layout: %m");
+                        log_error_errno(r, "Failed to set X11 keyboard layout: %m");
                         return r;
                 }
 
@@ -790,7 +790,7 @@ static int x11_convert_to_vconsole(Context *c, sd_bus *bus) {
         if (modified) {
                 r = vconsole_write_data(c);
                 if (r < 0)
-                        log_error_errno(-r, "Failed to set virtual console keymap: %m");
+                        log_error_errno(r, "Failed to set virtual console keymap: %m");
 
                 log_info("Changed virtual console keymap to '%s' toggle '%s'",
                          strempty(c->vc_keymap), strempty(c->vc_keymap_toggle));
@@ -923,7 +923,7 @@ static int method_set_locale(sd_bus *bus, sd_bus_message *m, void *userdata, sd_
 
                 r = locale_write_data(c, &settings);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to set locale: %m");
+                        log_error_errno(r, "Failed to set locale: %m");
                         return sd_bus_error_set_errnof(error, r, "Failed to set locale: %s", strerror(-r));
                 }
 
@@ -983,7 +983,7 @@ static int method_set_vc_keyboard(sd_bus *bus, sd_bus_message *m, void *userdata
 
                 r = vconsole_write_data(c);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to set virtual console keymap: %m");
+                        log_error_errno(r, "Failed to set virtual console keymap: %m");
                         return sd_bus_error_set_errnof(error, r, "Failed to set virtual console keymap: %s", strerror(-r));
                 }
 
@@ -992,7 +992,7 @@ static int method_set_vc_keyboard(sd_bus *bus, sd_bus_message *m, void *userdata
 
                 r = vconsole_reload(bus);
                 if (r < 0)
-                        log_error_errno(-r, "Failed to request keymap reload: %m");
+                        log_error_errno(r, "Failed to request keymap reload: %m");
 
                 sd_bus_emit_properties_changed(bus,
                                 "/org/freedesktop/locale1",
@@ -1002,7 +1002,7 @@ static int method_set_vc_keyboard(sd_bus *bus, sd_bus_message *m, void *userdata
                 if (convert) {
                         r = vconsole_convert_to_x11(c, bus);
                         if (r < 0)
-                                log_error_errno(-r, "Failed to convert keymap data: %m");
+                                log_error_errno(r, "Failed to convert keymap data: %m");
                 }
         }
 
@@ -1106,7 +1106,7 @@ static int method_set_x11_keyboard(sd_bus *bus, sd_bus_message *m, void *userdat
 
                 r = x11_write_data(c);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to set X11 keyboard layout: %m");
+                        log_error_errno(r, "Failed to set X11 keyboard layout: %m");
                         return sd_bus_error_set_errnof(error, r, "Failed to set X11 keyboard layout: %s", strerror(-r));
                 }
 
@@ -1124,7 +1124,7 @@ static int method_set_x11_keyboard(sd_bus *bus, sd_bus_message *m, void *userdat
                 if (convert) {
                         r = x11_convert_to_vconsole(c, bus);
                         if (r < 0)
-                                log_error_errno(-r, "Failed to convert keymap data: %m");
+                                log_error_errno(r, "Failed to convert keymap data: %m");
                 }
         }
 
@@ -1156,25 +1156,25 @@ static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) {
 
         r = sd_bus_default_system(&bus);
         if (r < 0) {
-                log_error_errno(-r, "Failed to get system bus connection: %m");
+                log_error_errno(r, "Failed to get system bus connection: %m");
                 return r;
         }
 
         r = sd_bus_add_object_vtable(bus, NULL, "/org/freedesktop/locale1", "org.freedesktop.locale1", locale_vtable, c);
         if (r < 0) {
-                log_error_errno(-r, "Failed to register object: %m");
+                log_error_errno(r, "Failed to register object: %m");
                 return r;
         }
 
         r = sd_bus_request_name(bus, "org.freedesktop.locale1", 0);
         if (r < 0) {
-                log_error_errno(-r, "Failed to register name: %m");
+                log_error_errno(r, "Failed to register name: %m");
                 return r;
         }
 
         r = sd_bus_attach_event(bus, event, 0);
         if (r < 0) {
-                log_error_errno(-r, "Failed to attach bus to event loop: %m");
+                log_error_errno(r, "Failed to attach bus to event loop: %m");
                 return r;
         }
 
@@ -1205,7 +1205,7 @@ int main(int argc, char *argv[]) {
 
         r = sd_event_default(&event);
         if (r < 0) {
-                log_error_errno(-r, "Failed to allocate event loop: %m");
+                log_error_errno(r, "Failed to allocate event loop: %m");
                 goto finish;
         }
 
@@ -1217,13 +1217,13 @@ int main(int argc, char *argv[]) {
 
         r = context_read_data(&context);
         if (r < 0) {
-                log_error_errno(-r, "Failed to read locale data: %m");
+                log_error_errno(r, "Failed to read locale data: %m");
                 goto finish;
         }
 
         r = bus_event_loop_with_idle(event, bus, "org.freedesktop.locale1", DEFAULT_EXIT_USEC, NULL, NULL);
         if (r < 0) {
-                log_error_errno(-r, "Failed to run event loop: %m");
+                log_error_errno(r, "Failed to run event loop: %m");
                 goto finish;
         }
 

src/login/inhibit.c

@@ -235,7 +235,7 @@ int main(int argc, char *argv[]) {
 
         r = sd_bus_default_system(&bus);
         if (r < 0) {
-                log_error_errno(-r, "Failed to connect to bus: %m");
+                log_error_errno(r, "Failed to connect to bus: %m");
                 return EXIT_FAILURE;
         }
 

src/login/loginctl.c

@@ -385,7 +385,7 @@ static int print_session_status_info(sd_bus *bus, const char *path, bool *new_li
 
         r = bus_map_all_properties(bus, "org.freedesktop.login1", path, map, &i);
         if (r < 0) {
-                log_error_errno(-r, "Could not get properties: %m");
+                log_error_errno(r, "Could not get properties: %m");
                 return r;
         }
 
@@ -498,7 +498,7 @@ static int print_user_status_info(sd_bus *bus, const char *path, bool *new_line)
 
         r = bus_map_all_properties(bus, "org.freedesktop.login1", path, map, &i);
         if (r < 0) {
-                log_error_errno(-r, "Could not get properties: %m");
+                log_error_errno(r, "Could not get properties: %m");
                 goto finish;
         }
 
@@ -562,7 +562,7 @@ static int print_seat_status_info(sd_bus *bus, const char *path, bool *new_line)
 
         r = bus_map_all_properties(bus, "org.freedesktop.login1", path, map, &i);
         if (r < 0) {
-                log_error_errno(-r, "Could not get properties: %m");
+                log_error_errno(r, "Could not get properties: %m");
                 goto finish;
         }
 
@@ -617,7 +617,7 @@ static int show_properties(sd_bus *bus, const char *path, bool *new_line) {
 
         r = bus_print_all_properties(bus, "org.freedesktop.login1", path, arg_property, arg_all);
         if (r < 0)
-                log_error_errno(-r, "Could not get properties: %m");
+                log_error_errno(r, "Could not get properties: %m");
 
         return r;
 }
@@ -700,7 +700,7 @@ static int show_user(sd_bus *bus, char **args, unsigned n) {
 
                 r = get_user_creds((const char**) (args+i), &uid, NULL, NULL, NULL);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to look up user %s: %m", args[i]);
+                        log_error_errno(r, "Failed to look up user %s: %m", args[i]);
                         return r;
                 }
 
@@ -860,7 +860,7 @@ static int enable_linger(sd_bus *bus, char **args, unsigned n) {
 
                 r = get_user_creds((const char**) (args+i), &uid, NULL, NULL, NULL);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to look up user %s: %m", args[i]);
+                        log_error_errno(r, "Failed to look up user %s: %m", args[i]);
                         return r;
                 }
 
@@ -893,7 +893,7 @@ static int terminate_user(sd_bus *bus, char **args, unsigned n) {
 
                 r = get_user_creds((const char**) (args+i), &uid, NULL, NULL, NULL);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to look up user %s: %m", args[i]);
+                        log_error_errno(r, "Failed to look up user %s: %m", args[i]);
                         return r;
                 }
 
@@ -929,7 +929,7 @@ static int kill_user(sd_bus *bus, char **args, unsigned n) {
 
                 r = get_user_creds((const char**) (args+i), &uid, NULL, NULL, NULL);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to look up user %s: %m", args[i]);
+                        log_error_errno(r, "Failed to look up user %s: %m", args[i]);
                         return r;
                 }
 
@@ -1308,7 +1308,7 @@ int main(int argc, char *argv[]) {
 
         r = bus_open_transport(arg_transport, arg_host, false, &bus);
         if (r < 0) {
-                log_error_errno(-r, "Failed to create bus connection: %m");
+                log_error_errno(r, "Failed to create bus connection: %m");
                 goto finish;
         }
 

src/login/logind-button.c

@@ -263,7 +263,7 @@ int button_open(Button *b) {
 
         r = sd_event_add_io(b->manager->event, &b->io_event_source, b->fd, EPOLLIN, button_dispatch, b);
         if (r < 0) {
-                log_error_errno(-r, "Failed to add button event: %m");
+                log_error_errno(r, "Failed to add button event: %m");
                 goto fail;
         }
 

src/login/logind-core.c

@@ -551,7 +551,7 @@ bool manager_is_docked_or_multiple_displays(Manager *m) {
          * assume that we are docked. */
         n = manager_count_displays(m);
         if (n < 0)
-                log_warning_errno(-n, "Display counting failed: %m");
+                log_warning_errno(n, "Display counting failed: %m");
         else if (n > 1) {
                 log_debug("Multiple (%i) displays connected.", n);
                 return true;

src/login/logind-inhibit.c

@@ -138,7 +138,7 @@ int inhibitor_save(Inhibitor *i) {
 
 finish:
         if (r < 0)
-                log_error_errno(-r, "Failed to save inhibit data %s: %m", i->state_file);
+                log_error_errno(r, "Failed to save inhibit data %s: %m", i->state_file);
 
         return r;
 }