X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/1a2e41af941573e69c02370329afe0192b61f213..5d8dcd1edbbfdd691a3a84e9191a96584cae34e1:/util.c diff --git a/util.c b/util.c index 6019fccb..c0580508 100644 --- a/util.c +++ b/util.c @@ -542,38 +542,6 @@ void kill_all(int sig) } } -/* Parse a user name or (optionally) a number into a uid */ -int user_to_uid(const char *name, uid_t *uid_p, BOOL num_ok) -{ - struct passwd *pass; - if (!name || !*name) - return 0; - if (num_ok && name[strspn(name, "0123456789")] == '\0') { - *uid_p = atol(name); - return 1; - } - if (!(pass = getpwnam(name))) - return 0; - *uid_p = pass->pw_uid; - return 1; -} - -/* Parse a group name or (optionally) a number into a gid */ -int group_to_gid(const char *name, gid_t *gid_p, BOOL num_ok) -{ - struct group *grp; - if (!name || !*name) - return 0; - if (num_ok && name[strspn(name, "0123456789")] == '\0') { - *gid_p = atol(name); - return 1; - } - if (!(grp = getgrnam(name))) - return 0; - *gid_p = grp->gr_gid; - return 1; -} - /** Lock a byte range in a open file */ int lock_range(int fd, int offset, int len) { @@ -1467,11 +1435,11 @@ const char *find_filename_suffix(const char *fn, int fn_len, int *len_ptr) #define UNIT (1 << 16) -uint32 fuzzy_distance(const char *s1, int len1, const char *s2, int len2) +uint32 fuzzy_distance(const char *s1, unsigned len1, const char *s2, unsigned len2) { uint32 a[MAXPATHLEN], diag, above, left, diag_inc, above_inc, left_inc; int32 cost; - int i1, i2; + unsigned i1, i2; if (!len1 || !len2) { if (!len1) {