mountd: cache.c no longer needs #include xmalloc.h

[nfs-utils.git] / utils / mountd / cache.c

diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index 70e1aa4629084cb2970e61fcb6898b6ed99cf261..c264e142803dedbbcfa67aaf42a05e72b60acdc3 100644 (file)
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -29,7 +29,6 @@
 #include "nfslib.h"
 #include "exportfs.h"
 #include "mountd.h"
-#include "xmalloc.h"
 #include "fsloc.h"
 #include "pseudoflavors.h"
 
@@ -109,12 +108,10 @@ static void auth_unix_ip(FILE *f)
                struct addrinfo *ai = NULL;
 
                ai = client_resolve(tmp->ai_addr);
-               if (ai == NULL)
-                       goto out;
-               client = client_compose(ai);
-               freeaddrinfo(ai);
-               if (!client)
-                       goto out;
+               if (ai) {
+                       client = client_compose(ai);
+                       freeaddrinfo(ai);
+               }
        }
        qword_print(f, "nfsd");
        qword_print(f, ipaddr);
@@ -127,7 +124,6 @@ static void auth_unix_ip(FILE *f)
        xlog(D_CALL, "auth_unix_ip: client %p '%s'", client, client?client: "DEFAULT");
 
        free(client);
-out:
        freeaddrinfo(tmp);
 
 }
@@ -238,17 +234,17 @@ 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++) {
-               char c = *val;
+               int c = *val;
                if (!isxdigit(c))
                        continue;
                if (isalpha(c)) {
@@ -260,7 +256,7 @@ static int get_uuid(const char *val, int uuidlen, char *u)
                        c = c - '0' + 0;
                if ((i&1) == 0)
                        c <<= 4;
-               u[i/2] ^= c;
+               u[i/2] ^= (char)c;
                i++;
                if (i == uuidlen*2)
                        i = 0;
@@ -268,7 +264,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,15 +362,17 @@ struct parsed_fsid {
        unsigned int minor;
        unsigned int major;
        unsigned int fsidnum;
-       int uuidlen;
+       size_t uuidlen;
        char *fhuuid;
 };
 
-int parse_fsid(int fsidtype, int fsidlen, char *fsid, struct parsed_fsid *parsed)
+static int parse_fsid(int fsidtype, int fsidlen, char *fsid,
+               struct parsed_fsid *parsed)
 {
        unsigned int dev;
        unsigned long long inode64;
 
+       memset(parsed, 0, sizeof(*parsed));
        parsed->fsidtype = fsidtype;
        switch(fsidtype) {
        case FSID_DEV: /* 4 bytes: 2 major, 2 minor, 4 inode */
@@ -501,7 +499,7 @@ static bool match_fsid(struct parsed_fsid *parsed, nfs_export *exp, char *path)
        return false;
 }
 
-struct addrinfo *lookup_client_addr(char *dom)
+static struct addrinfo *lookup_client_addr(char *dom)
 {
        struct addrinfo *ret;
        struct addrinfo *tmp;
@@ -756,7 +754,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] == '/');