Removed warnings from idmapd.c

idmapd.c:120: warning: missing initializer
idmapd.c:120: warning: (near initialization for 'nfsd_ic[0].ic_event')
idmapd.c:121: warning: missing initializer
idmapd.c:121: warning: (near initialization for 'nfsd_ic[1].ic_event')
idmapd.c: In function 'flush_nfsd_cache':
idmapd.c:173: warning: comparison between signed and unsigned integer expressions
idmapd.c: In function 'dirscancb':
idmapd.c:384: warning: unused parameter 'fd'
idmapd.c:384: warning: unused parameter 'which'
idmapd.c: In function 'svrreopen':
idmapd.c:468: warning: unused parameter 'fd'
idmapd.c:468: warning: unused parameter 'which'
idmapd.c:468: warning: unused parameter 'data'
idmapd.c: In function 'clntscancb':
idmapd.c:474: warning: unused parameter 'fd'
idmapd.c:474: warning: unused parameter 'which'
idmapd.c: In function 'nfsdcb':
idmapd.c:488: warning: unused parameter 'fd'
idmapd.c: In function 'nfscb':
idmapd.c:663: warning: unused parameter 'fd'
idmapd.c: In function 'validateascii':
idmapd.c:850: warning: comparison between signed and unsigned integer expressions
idmapd.c:858: warning: comparison between signed and unsigned integer expressions
idmapd.c: In function 'getfield':
idmapd.c:916: warning: comparison between signed and unsigned integer expressions

Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/utils/idmapd/idmapd.c b/utils/idmapd/idmapd.c
index 573abaaead3153817fec3667169d6267c8bf1df2..9ecab66f2696adec7cb7e82ebb8cac95146b8b37 100644 (file)
--- a/utils/idmapd/idmapd.c
+++ b/utils/idmapd/idmapd.c
@@ -117,8 +117,24 @@ struct idmap_client {
        TAILQ_ENTRY(idmap_client)  ic_next;
 };
 static struct idmap_client nfsd_ic[2] = {
        TAILQ_ENTRY(idmap_client)  ic_next;
 };
 static struct idmap_client nfsd_ic[2] = {

-{IC_IDNAME, "Server", "", IC_IDNAME_CHAN, -1, -1, 0},
-{IC_NAMEID, "Server", "", IC_NAMEID_CHAN, -1, -1, 0},
+{
+       .ic_which = IC_IDNAME, 
+       .ic_clid = "Server", 
+       .ic_id = "", 
+       .ic_path = IC_IDNAME_CHAN, 
+       .ic_fd = -1, 
+       .ic_dirfd = -1, 
+       .ic_scanned = 0
+},
+{
+       .ic_which = IC_NAMEID, 
+       .ic_clid = "Server", 
+       .ic_id = "", 
+       .ic_path = IC_NAMEID_CHAN, 
+       .ic_fd = -1, 
+       .ic_dirfd = -1, 
+       .ic_scanned = 0
+},

 };
 
 TAILQ_HEAD(idmap_clientq, idmap_client);
 };
 
 TAILQ_HEAD(idmap_clientq, idmap_client);


@@ -170,7 +186,7 @@ flush_nfsd_cache(char *path, time_t now)
        fd = open(path, O_RDWR);
        if (fd == -1)
                return -1;
        fd = open(path, O_RDWR);
        if (fd == -1)
                return -1;

-       if (write(fd, stime, strlen(stime)) != strlen(stime)) {
+       if (write(fd, stime, strlen(stime)) != (ssize_t)strlen(stime)) {

                errx(1, "Flushing nfsd cache failed: errno %d (%s)",
                        errno, strerror(errno));
        }
                errx(1, "Flushing nfsd cache failed: errno %d (%s)",
                        errno, strerror(errno));
        }


@@ -381,7 +397,7 @@ main(int argc, char **argv)
 }
 
 static void
 }
 
 static void

-dirscancb(int fd, short which, void *data)
+dirscancb(int UNUSED(fd), short UNUSED(which), void *data)

 {
        int nent, i;
        struct dirent **ents;
 {
        int nent, i;
        struct dirent **ents;


@@ -465,13 +481,13 @@ out:
 }
 
 static void
 }
 
 static void

-svrreopen(int fd, short which, void *data)
+svrreopen(int UNUSED(fd), short UNUSED(which), void *UNUSED(data))

 {
        nfsdreopen();
 }
 
 static void
 {
        nfsdreopen();
 }
 
 static void

-clntscancb(int fd, short which, void *data)
+clntscancb(int UNUSED(fd), short UNUSED(which), void *data)

 {
        struct idmap_clientq *icq = data;
        struct idmap_client *ic;
 {
        struct idmap_clientq *icq = data;
        struct idmap_client *ic;


@@ -485,7 +501,7 @@ clntscancb(int fd, short which, void *data)
 }
 
 static void
 }
 
 static void

-nfsdcb(int fd, short which, void *data)
+nfsdcb(int UNUSED(fd), short which, void *data)

 {
        struct idmap_client *ic = data;
        struct idmap_msg im;
 {
        struct idmap_client *ic = data;
        struct idmap_msg im;


@@ -660,7 +676,7 @@ imconv(struct idmap_client *ic, struct idmap_msg *im)
 }
 
 static void
 }
 
 static void

-nfscb(int fd, short which, void *data)
+nfscb(int UNUSED(fd), short which, void *data)

 {
        struct idmap_client *ic = data;
        struct idmap_msg im;
 {
        struct idmap_client *ic = data;
        struct idmap_msg im;


@@ -845,7 +861,7 @@ nametoidres(struct idmap_msg *im)
 static int
 validateascii(char *string, u_int32_t len)
 {
 static int
 validateascii(char *string, u_int32_t len)
 {

-       int i;
+       u_int32_t i;

 
        for (i = 0; i < len; i++) {
                if (string[i] == '\0')
 
        for (i = 0; i < len; i++) {
                if (string[i] == '\0')


@@ -901,7 +917,7 @@ static int
 getfield(char **bpp, char *fld, size_t fldsz)
 {
        char *bp;
 getfield(char **bpp, char *fld, size_t fldsz)
 {
        char *bp;

-       u_int val, n;
+       int val, n;

 
        while ((bp = strsep(bpp, " ")) != NULL && bp[0] == '\0')
                ;
 
        while ((bp = strsep(bpp, " ")) != NULL && bp[0] == '\0')
                ;