From: Steve Dickson Date: Mon, 19 Jul 2010 18:43:26 +0000 (-0400) Subject: Removed warnings from cache.c X-Git-Tag: nfs-utils-1-2-3-rc5~16 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=7b331fb9d24a71242a6c0a45a06c49174b552c64;p=nfs-utils.git Removed warnings from cache.c cache.c:812: warning: missing initializer cache.c:812: warning: (near initialization for 'cachelist[0].f') cache.c:813: warning: missing initializer cache.c:813: warning: (near initialization for 'cachelist[1].f') cache.c:814: warning: missing initializer cache.c:814: warning: (near initialization for 'cachelist[2].f') cache.c:815: warning: missing initializer cache.c:815: warning: (near initialization for 'cachelist[3].f') cache.c:816: warning: missing initializer cache.c:816: warning: (near initialization for 'cachelist[4].f') cache.c: In function 'cache_export_ent': cache.c:887: warning: comparison between signed and unsigned integer expressions cache.c:907: warning: comparison between signed and unsigned integer expressions Signed-off-by: Steve Dickson --- diff --git a/support/include/nfslib.h b/support/include/nfslib.h index b8e7c40..f57f2e2 100644 --- a/support/include/nfslib.h +++ b/support/include/nfslib.h @@ -83,7 +83,7 @@ struct exportent { int e_nsquids; int * e_sqgids; int e_nsqgids; - int e_fsid; + unsigned int e_fsid; char * e_mountpoint; int e_fslocmethod; char * e_fslocdata; diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c index 5488056..2909ad3 100644 --- a/utils/mountd/cache.c +++ b/utils/mountd/cache.c @@ -593,7 +593,7 @@ void nfsd_fh(FILE *f) return; } -static void write_fsloc(FILE *f, struct exportent *ep, char *path) +static void write_fsloc(FILE *f, struct exportent *ep) { struct servers *servers; @@ -648,7 +648,7 @@ static int dump_to_cache(FILE *f, char *domain, char *path, struct exportent *ex qword_printint(f, exp->e_anonuid); qword_printint(f, exp->e_anongid); qword_printint(f, exp->e_fsid); - write_fsloc(f, exp, path); + write_fsloc(f, exp); write_secinfo(f, exp, flag_mask); if (exp->e_uuid == NULL || different_fs) { char u[16]; @@ -809,11 +809,11 @@ struct { void (*cache_handle)(FILE *f); FILE *f; } cachelist[] = { - { "auth.unix.ip", auth_unix_ip}, - { "auth.unix.gid", auth_unix_gid}, - { "nfsd.export", nfsd_export}, - { "nfsd.fh", nfsd_fh}, - { NULL, NULL } + { "auth.unix.ip", auth_unix_ip, NULL}, + { "auth.unix.gid", auth_unix_gid, NULL}, + { "nfsd.export", nfsd_export, NULL}, + { "nfsd.fh", nfsd_fh, NULL}, + { NULL, NULL, NULL } }; extern int manage_gids; @@ -881,8 +881,8 @@ int cache_export_ent(char *domain, struct exportent *exp, char *path) * and export them with the same options */ struct stat stb; - int l = strlen(exp->e_path); - int dev; + size_t l = strlen(exp->e_path); + __dev_t dev; if (strlen(path) <= l || path[l] != '/' || strncmp(exp->e_path, path, l) != 0)