X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsysctl%2Fsysctl.c;h=973e67e3c8989a9c550bbc7aabf8ecc81843682b;hb=5544ee85163733eaa50f598fcf3bd9421d4a42f9;hp=2f73c32049d7c3854564d1d3e0886832e865f3d2;hpb=0a1beeb64207eaa88ab9236787b1cbc2f704ae14;p=elogind.git

diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
index 2f73c3204..973e67e3c 100644
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -134,8 +134,7 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno
                 if (ignore_enoent && r == -ENOENT)
                         return 0;
 
-                log_error_errno(-r, "Failed to open file '%s', ignoring: %m", path);
-                return r;
+                return log_error_errno(r, "Failed to open file '%s', ignoring: %m", path);
         }
 
         log_debug("parse: %s", path);
@@ -148,7 +147,7 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno
                         if (feof(f))
                                 break;
 
-                        log_error("Failed to read file '%s', ignoring: %m", path);
+                        log_error_errno(errno, "Failed to read file '%s', ignoring: %m", path);
                         return -errno;
                 }
 
@@ -196,7 +195,7 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno
 
                 k = hashmap_put(sysctl_options, property, new_value);
                 if (k < 0) {
-                        log_error_errno(-k, "Failed to add sysctl variable %s to hashmap: %m", property);
+                        log_error_errno(k, "Failed to add sysctl variable %s to hashmap: %m", property);
                         free(property);
                         free(new_value);
                         return k;
@@ -314,7 +313,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 sysctl.d files: %m");
+                        log_error_errno(r, "Failed to enumerate sysctl.d files: %m");
                         goto finish;
                 }