mountd: Make local functions static

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

diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index 6de05f111eb5a76029c831f4a244be4bdb36a32a..57a3fedaa78ee2f5ba88712feced07c9e9193b0e 100644 (file)
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -329,7 +329,7 @@ static char *next_mnt(void **v, char *p)
 {
        FILE *f;
        struct mntent *me;
-       int l = strlen(p);
+       size_t l = strlen(p);
        if (*v == NULL) {
                f = setmntent("/etc/mtab", "r");
                *v = f;
@@ -351,7 +351,7 @@ static char *next_mnt(void **v, char *p)
 static bool subexport(struct exportent *e1, struct exportent *e2)
 {
        char *p1 = e1->e_path, *p2 = e2->e_path;
-       int l2 = strlen(p2);
+       size_t l2 = strlen(p2);
 
        return e2->e_flags & NFSEXP_CROSSMOUNT
               && strncmp(p1, p2, l2) == 0
@@ -370,11 +370,13 @@ struct parsed_fsid {
        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 +503,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;