X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=utils%2Fmountd%2Fcache.c;h=fbaa28eb8b0f2d339429ce983e154f64a011289f;hb=23164d134e0dab8eb5c3b471ae3f087f1cd9968a;hp=57a3fedaa78ee2f5ba88712feced07c9e9193b0e;hpb=15b940351e88da5cb3d68d71887196f89a13e0de;p=nfs-utils.git diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c index 57a3fed..fbaa28e 100644 --- a/utils/mountd/cache.c +++ b/utils/mountd/cache.c @@ -238,13 +238,13 @@ static const char *get_uuid_blkdev(char *path) #define get_uuid_blkdev(path) (NULL) #endif -static int get_uuid(const char *val, int uuidlen, char *u) +static int get_uuid(const char *val, size_t uuidlen, char *u) { /* extract hex digits from uuidstr and compose a uuid * of the given length (max 16), xoring bytes to make * a smaller uuid. */ - int i = 0; + size_t i = 0; memset(u, 0, uuidlen); for ( ; *val ; val++) { @@ -268,7 +268,7 @@ static int get_uuid(const char *val, int uuidlen, char *u) return 1; } -static int uuid_by_path(char *path, int type, int uuidlen, char *uuid) +static int uuid_by_path(char *path, int type, size_t uuidlen, char *uuid) { /* get a uuid for the filesystem found at 'path'. * There are several possible ways of generating the @@ -366,7 +366,7 @@ struct parsed_fsid { unsigned int minor; unsigned int major; unsigned int fsidnum; - int uuidlen; + size_t uuidlen; char *fhuuid; }; @@ -758,7 +758,7 @@ static int dump_to_cache(FILE *f, char *domain, char *path, struct exportent *ex static int is_subdirectory(char *child, char *parent) { - int l = strlen(parent); + size_t l = strlen(parent); return strcmp(child, parent) == 0 || (strncmp(child, parent, l) == 0 && child[l] == '/');