From: Chuck Lever Date: Tue, 30 Oct 2012 18:44:57 +0000 (-0400) Subject: mountd: Avoid unnecessary type conversions X-Git-Tag: debian/1%1.2.8-1~11^2^2~74 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=d8b5dc74c5aa258a937b3b3d74366f997ffd6d7f;p=nfs-utils.git mountd: Avoid unnecessary type conversions Clean up compiler warnings: cache.c: In function get_uuid: cache.c:249:2: warning: conversion to size_t from int may change the sign of the result [-Wsign-conversion] And the like. signed-off-by: Chuck Lever Signed-off-by: Steve Dickson --- diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c index 57a3fed..64ca5ba 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; };