treewide: use log_*_errno whenever %m is in the format string

[elogind.git] / src / sysusers / sysusers.c

diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index 88111029060af27df99839122f27d8523efb05de..e69a5f58ad82d9195f8cfc77b17a443672d1c0c5 100644 (file)
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -226,15 +226,15 @@ static int make_backup(const char *target, const char *x) {
 
         /* Copy over the access mask */
         if (fchmod(fileno(dst), st.st_mode & 07777) < 0)
-                log_warning("Failed to change mode on %s: %m", backup);
+                log_warning_errno(errno, "Failed to change mode on %s: %m", backup);
 
         if (fchown(fileno(dst), st.st_uid, st.st_gid)< 0)
-                log_warning("Failed to change ownership of %s: %m", backup);
+                log_warning_errno(errno, "Failed to change ownership of %s: %m", backup);
 
         ts[0] = st.st_atim;
         ts[1] = st.st_mtim;
         if (futimens(fileno(dst), ts) < 0)
-                log_warning("Failed to fix access and modification time of %s: %m", backup);
+                log_warning_errno(errno, "Failed to fix access and modification time of %s: %m", backup);
 
         if (rename(temp, backup) < 0)
                 goto fail;
@@ -899,7 +899,7 @@ static int add_user(Item *i) {
                         return 0;
                 }
                 if (!IN_SET(errno, 0, ENOENT)) {
-                        log_error("Failed to check if user %s already exists: %m", i->name);
+                        log_error_errno(errno, "Failed to check if user %s already exists: %m", i->name);
                         return -errno;
                 }
 
@@ -911,7 +911,7 @@ static int add_user(Item *i) {
                         return -EBADMSG;
                 }
                 if (!IN_SET(errno, 0, ENOENT)) {
-                        log_error("Failed to check if user %s already exists in shadow database: %m", i->name);
+                        log_error_errno(errno, "Failed to check if user %s already exists in shadow database: %m", i->name);
                         return -errno;
                 }
         }
@@ -919,10 +919,8 @@ static int add_user(Item *i) {
         /* Try to use the suggested numeric uid */
         if (i->uid_set) {
                 r = uid_is_ok(i->uid, i->name);
-                if (r < 0) {
-                        log_error_errno(r, "Failed to verify uid " UID_FMT ": %m", i->uid);
-                        return r;
-                }
+                if (r < 0)
+                        return log_error_errno(r, "Failed to verify uid " UID_FMT ": %m", i->uid);
                 if (r == 0) {
                         log_debug("Suggested user ID " UID_FMT " for %s already used.", i->uid, i->name);
                         i->uid_set = false;
@@ -939,10 +937,9 @@ static int add_user(Item *i) {
                                 log_debug("User ID " UID_FMT " of file not suitable for %s.", c, i->name);
                         else {
                                 r = uid_is_ok(c, i->name);
-                                if (r < 0) {
-                                        log_error_errno(r, "Failed to verify uid " UID_FMT ": %m", i->uid);
-                                        return r;
-                                } else if (r > 0) {
+                                if (r < 0)
+                                        return log_error_errno(r, "Failed to verify uid " UID_FMT ": %m", i->uid);
+                                else if (r > 0) {
                                         i->uid = c;
                                         i->uid_set = true;
                                 } else
@@ -954,10 +951,8 @@ static int add_user(Item *i) {
         /* Otherwise try to reuse the group ID */
         if (!i->uid_set && i->gid_set) {
                 r = uid_is_ok((uid_t) i->gid, i->name);
-                if (r < 0) {
-                        log_error_errno(r, "Failed to verify uid " UID_FMT ": %m", i->uid);
-                        return r;
-                }
+                if (r < 0)
+                        return log_error_errno(r, "Failed to verify uid " UID_FMT ": %m", i->uid);
                 if (r > 0) {
                         i->uid = (uid_t) i->gid;
                         i->uid_set = true;
@@ -974,10 +969,9 @@ static int add_user(Item *i) {
                         }
 
                         r = uid_is_ok(search_uid, i->name);
-                        if (r < 0) {
-                                log_error_errno(r, "Failed to verify uid " UID_FMT ": %m", i->uid);
-                                return r;
-                        } else if (r > 0)
+                        if (r < 0)
+                                return log_error_errno(r, "Failed to verify uid " UID_FMT ": %m", i->uid);
+                        else if (r > 0)
                                 break;
                 }
 
@@ -1063,7 +1057,7 @@ static int add_group(Item *i) {
                         return 0;
                 }
                 if (!IN_SET(errno, 0, ENOENT)) {
-                        log_error("Failed to check if group %s already exists: %m", i->name);
+                        log_error_errno(errno, "Failed to check if group %s already exists: %m", i->name);
                         return -errno;
                 }
         }
@@ -1071,10 +1065,8 @@ static int add_group(Item *i) {
         /* Try to use the suggested numeric gid */
         if (i->gid_set) {
                 r = gid_is_ok(i->gid);
-                if (r < 0) {
-                        log_error_errno(r, "Failed to verify gid " GID_FMT ": %m", i->gid);
-                        return r;
-                }
+                if (r < 0)
+                        return log_error_errno(r, "Failed to verify gid " GID_FMT ": %m", i->gid);
                 if (r == 0) {
                         log_debug("Suggested group ID " GID_FMT " for %s already used.", i->gid, i->name);
                         i->gid_set = false;
@@ -1084,10 +1076,8 @@ static int add_group(Item *i) {
         /* Try to reuse the numeric uid, if there's one */
         if (!i->gid_set && i->uid_set) {
                 r = gid_is_ok((gid_t) i->uid);
-                if (r < 0) {
-                        log_error_errno(r, "Failed to verify gid " GID_FMT ": %m", i->gid);
-                        return r;
-                }
+                if (r < 0)
+                        return log_error_errno(r, "Failed to verify gid " GID_FMT ": %m", i->gid);
                 if (r > 0) {
                         i->gid = (gid_t) i->uid;
                         i->gid_set = true;
@@ -1104,10 +1094,9 @@ static int add_group(Item *i) {
                                 log_debug("Group ID " GID_FMT " of file not suitable for %s.", c, i->name);
                         else {
                                 r = gid_is_ok(c);
-                                if (r < 0) {
-                                        log_error_errno(r, "Failed to verify gid " GID_FMT ": %m", i->gid);
-                                        return r;
-                                } else if (r > 0) {
+                                if (r < 0)
+                                        return log_error_errno(r, "Failed to verify gid " GID_FMT ": %m", i->gid);
+                                else if (r > 0) {
                                         i->gid = c;
                                         i->gid_set = true;
                                 } else
@@ -1127,10 +1116,9 @@ static int add_group(Item *i) {
                         }
 
                         r = gid_is_ok(search_uid);
-                        if (r < 0) {
-                                log_error_errno(r, "Failed to verify gid " GID_FMT ": %m", i->gid);
-                                return r;
-                        } else if (r > 0)
+                        if (r < 0)
+                                return log_error_errno(r, "Failed to verify gid " GID_FMT ": %m", i->gid);
+                        else if (r > 0)
                                 break;
                 }
 
@@ -1721,8 +1709,7 @@ static int read_config_file(const char *fn, bool ignore_enoent) {
                         if (ignore_enoent && r == -ENOENT)
                                 return 0;
 
-                        log_error_errno(r, "Failed to open '%s', ignoring: %m", fn);
-                        return r;
+                        return log_error_errno(r, "Failed to open '%s', ignoring: %m", fn);
                 }
 
                 f = rf;
@@ -1744,7 +1731,7 @@ static int read_config_file(const char *fn, bool ignore_enoent) {
         }
 
         if (ferror(f)) {
-                log_error("Failed to read from file %s: %m", fn);
+                log_error_errno(errno, "Failed to read from file %s: %m", fn);
                 if (r == 0)
                         r = -EIO;
         }