X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/77d4c400c200e11aa1ab814101678c02c2d90414..5f0f2e08946410786b079596915278f9d13a23a9:/util.c

diff --git a/util.c b/util.c
index 05748b1b..5dd6ead4 100644
--- a/util.c
+++ b/util.c
@@ -147,8 +147,8 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode)
 		t[1].tv_usec = 0;
 # ifdef HAVE_LUTIMES
 		if (S_ISLNK(mode)) {
-			if (lutimes(fname, t) < 0 && errno != ENOSYS)
-				return -1;
+			if (lutimes(fname, t) < 0)
+				return errno == ENOSYS ? 1 : -1;
 			return 0;
 		}
 # endif
@@ -466,31 +466,27 @@ void kill_all(int sig)
 }
 
 /** Turn a user name into a uid */
-int name_to_uid(const char *name, uid_t *uid)
+int name_to_uid(const char *name, uid_t *uid_p)
 {
 	struct passwd *pass;
 	if (!name || !*name)
 		return 0;
-	pass = getpwnam(name);
-	if (pass) {
-		*uid = pass->pw_uid;
-		return 1;
-	}
-	return 0;
+	if (!(pass = getpwnam(name)))
+		return 0;
+	*uid_p = pass->pw_uid;
+	return 1;
 }
 
 /** Turn a group name into a gid */
-int name_to_gid(const char *name, gid_t *gid)
+int name_to_gid(const char *name, gid_t *gid_p)
 {
 	struct group *grp;
 	if (!name || !*name)
 		return 0;
-	grp = getgrnam(name);
-	if (grp) {
-		*gid = grp->gr_gid;
-		return 1;
-	}
-	return 0;
+	if (!(grp = getgrnam(name)))
+		return 0;
+	*gid_p = grp->gr_gid;
+	return 1;
 }
 
 /** Lock a byte range in a open file */