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 <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index 57a3fedaa78ee2f5ba88712feced07c9e9193b0e..64ca5ba3fee1d561ad1cf0042585cea82dbf937a 100644 (file)
--- 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
 
 #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.
         */
 {
        /* 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++) {
        
        memset(u, 0, uuidlen);
        for ( ; *val ; val++) {


@@ -268,7 +268,7 @@ static int get_uuid(const char *val, int uuidlen, char *u)
        return 1;
 }
 
        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
 {
        /* 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;
        unsigned int minor;
        unsigned int major;
        unsigned int fsidnum;

-       int uuidlen;
+       size_t uuidlen;

        char *fhuuid;
 };
 
        char *fhuuid;
 };