xfstests: eliminate warnings under dmapi/src/suite1/cmd (2)

Eliminate build warnings reported on files located under
dmapi/src/suite1/cmd/ (second of three).

Signed-off-by: Alex Elder <aelder@sgi.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>

diff --git a/dmapi/src/suite1/cmd/getall_dmattr.c b/dmapi/src/suite1/cmd/getall_dmattr.c
index 4637c273368c72e7c3722052b8908853d1fd2eea..56f2248d04cf37baa087e33b9f13e778cdeb1243 100644 (file)
--- a/dmapi/src/suite1/cmd/getall_dmattr.c
+++ b/dmapi/src/suite1/cmd/getall_dmattr.c
@@ -66,7 +66,8 @@ main(
        char            *name;
        int             opt;
 
-       if (Progname = strrchr(argv[0], '/')) {
+       Progname = strrchr(argv[0], '/');
+       if (Progname) {
                Progname++;
        } else {
                Progname = argv[0];
@@ -114,14 +115,14 @@ main(
            bufp, &rlenp)) {
                if (errno == E2BIG) {
                        fprintf(stderr, "dm_getall_dmattr buffer too small, "
-                               "should be %d bytes\n", rlenp);
+                               "should be %zd bytes\n", rlenp);
                } else {
                        fprintf(stderr, "dm_getall_dmattr failed, %s\n",
                                strerror(errno));
                }
                exit(1);
        }
-       fprintf(stdout, "rlenp is %d\n", rlenp);
+       fprintf(stdout, "rlenp is %zd\n", rlenp);
        if (rlenp > 0) {
                dm_attrlist_t   *attrlist;
 

diff --git a/dmapi/src/suite1/cmd/handle_to_fshandle.c b/dmapi/src/suite1/cmd/handle_to_fshandle.c
index 8608c74853d02f7b89a862beba7f2c878e51aae9..93f101d51e34c223d33f27159ea42f72a47d2f49 100644 (file)
--- a/dmapi/src/suite1/cmd/handle_to_fshandle.c
+++ b/dmapi/src/suite1/cmd/handle_to_fshandle.c
@@ -56,7 +56,8 @@ main(
        char            buffer[100];
        int             error;
 
-       if (Progname = strrchr(argv[0], '/')) {
+       Progname = strrchr(argv[0], '/');
+       if (Progname) {
                Progname++;
        } else {
                Progname = argv[0];

diff --git a/dmapi/src/suite1/cmd/handle_to_path.c b/dmapi/src/suite1/cmd/handle_to_path.c
index 3a4c2265de8eedfa83b0646922d55babb404ba26..b3759e124b56c8e35d807fe78753d13d28c6a73c 100644 (file)
--- a/dmapi/src/suite1/cmd/handle_to_path.c
+++ b/dmapi/src/suite1/cmd/handle_to_path.c
@@ -22,6 +22,7 @@
 #include <string.h>
 
 #include <lib/dmport.h>
+#include <lib/hsm.h>
 
 #include <getopt.h>
 #ifdef linux
@@ -84,7 +85,8 @@ main(
        char            *name;
        int             opt;
 
-       if (Progname = strrchr(argv[0], '/')) {
+       Progname = strrchr(argv[0], '/');
+       if (Progname) {
                Progname++;
        } else {
                Progname = argv[0];
@@ -130,16 +132,16 @@ main(
            buflen, pathbufp, &rlenp)) {
                if (errno == E2BIG) {
                        fprintf(stderr, "dm_handle_to_path buffer too small, "
-                               "should be %d bytes\n", rlenp);
+                               "should be %zd bytes\n", rlenp);
                } else {
                        fprintf(stderr, "dm_handle_to_path failed, (%d) %s\n",
                                errno, strerror(errno));
                }
                return(1);
        }
-       fprintf(stderr, "rlenp is %d, pathbufp is %s\n", rlenp, (char*)pathbufp);
+       fprintf(stderr, "rlenp is %zd, pathbufp is %s\n", rlenp, (char*)pathbufp);
        if (strlen(pathbufp) + 1 != rlenp) {
-               fprintf(stderr, "rlenp is %d, should be %d\n", rlenp,
+               fprintf(stderr, "rlenp is %zd, should be %zd\n", rlenp,
                        strlen(pathbufp) + 1);
                return(1);
        }

diff --git a/dmapi/src/suite1/cmd/init_service.c b/dmapi/src/suite1/cmd/init_service.c
index 1673f4ca3cf18c0216b0d8524940ded025e9954f..6c7afa447bc2e9fd1aa6da7a23a98b034188e832 100644 (file)
--- a/dmapi/src/suite1/cmd/init_service.c
+++ b/dmapi/src/suite1/cmd/init_service.c
@@ -47,7 +47,8 @@ main(
 {
        char            *name;
 
-       if (Progname = strrchr(argv[0], '/')) {
+       Progname = strrchr(argv[0], '/');
+       if (Progname) {
                Progname++;
        } else {
                Progname = argv[0];

diff --git a/dmapi/src/suite1/cmd/link_test.c b/dmapi/src/suite1/cmd/link_test.c
index 3d18de817fd18d9334cb5b937c16c0f921d20933..2d35da8a65c78aac47f67051efba5421d387dfd2 100644 (file)
--- a/dmapi/src/suite1/cmd/link_test.c
+++ b/dmapi/src/suite1/cmd/link_test.c
@@ -36,37 +36,44 @@ main(
        int     argc,
        char    **argv)
 {
-       dm_sessid_t     sid, oldsid, targetsid, *newsidp, *sidbufp;
-       dm_token_t      token, *tokenp, *rtokenp, *tokenbufp;
-       dm_attrname_t   *attrnamep;
-       dm_off_t        off, *offp, *roffp;
-       dm_extent_t     *extentp;
-       dm_inherit_t    *inheritbufp;
-       dm_stat_t       *statp;
-       dm_size_t       len, *dmrlenp, *retvalp;
-       dm_attrloc_t    *locp;
-       dm_eventset_t   *eventsetp;
-       dm_config_t     flagname;
-       dm_region_t     *regbufp;
-       dm_response_t   response;
-       dm_right_t      right, *rightp;
-       dm_igen_t       igen, *igenp;
-       dm_msgtype_t    msgtype;
-       dm_fileattr_t   *attrp;
-       dm_boolean_t    enable, *exactflagp;
-       dm_timestruct_t *delay;
-       mode_t          mode;
-       size_t          hlen, dirhlen, hlen1, hlen2, targhlen, *fshlenp, *hlenp;
-       size_t          msglen, buflen, *rlenp;
-       u_int           nelem, mask, maxmsgs, uflags, *nelemp, maxevent;
-       void            *hanp, *dirhanp, *hanp1, *hanp2, *targhanp;
-       void            *msgdatap, *bufp, **hanpp, *respbufp, **fshanpp;
-       dm_fsid_t       fsid, *fsidp;
-       dm_ino_t        ino, *inop;
-       char            *cname, *sessinfop, *path, *pathbufp, **versionstrpp;
-       int             flags, fd, setdtime, reterror;
-       u_int   urc;
-       int     rc;
+       dm_sessid_t     sid = 0, oldsid = 0, targetsid = 0;
+       dm_sessid_t     *newsidp = NULL, *sidbufp = NULL;
+       dm_token_t      token = 0, *tokenp = NULL;
+       dm_token_t      *rtokenp = NULL, *tokenbufp = NULL;
+       dm_attrname_t   *attrnamep = NULL;
+       dm_off_t        off = 0, *offp = NULL, *roffp = NULL;
+       dm_extent_t     *extentp = NULL;
+       dm_inherit_t    *inheritbufp = NULL;
+       dm_stat_t       *statp = NULL;
+       dm_size_t       len = 0, *dmrlenp = NULL, *retvalp = NULL;
+       dm_attrloc_t    *locp = NULL;
+       dm_eventset_t   *eventsetp = NULL;
+       dm_config_t     flagname = DM_CONFIG_INVALID;
+       dm_region_t     *regbufp = NULL;
+       dm_response_t   response = DM_RESP_INVALID;
+       dm_right_t      right = DM_RIGHT_NULL, *rightp = NULL;
+       dm_igen_t       igen, *igenp = NULL;
+       dm_msgtype_t    msgtype = DM_MSGTYPE_INVALID;
+       dm_fileattr_t   *attrp = NULL;
+       dm_boolean_t    enable = 0, *exactflagp = NULL;
+       dm_timestruct_t *delay = NULL;
+       mode_t          mode = 0;
+       size_t          hlen = 0, dirhlen = 0, hlen1 = 0, hlen2 = 0;
+       size_t          targhlen = 0, *fshlenp = NULL, *hlenp = NULL;
+       size_t          msglen = 0, buflen = 0, *rlenp = NULL;
+       u_int           nelem = 0, mask = 0, maxmsgs = 0, uflags = 0;
+       u_int           *nelemp = NULL, maxevent = 0;
+       void            *hanp = NULL, *dirhanp = NULL;
+       void            *hanp1 = NULL, *hanp2 = NULL, *targhanp = NULL;
+       void            *msgdatap = NULL, *bufp = NULL, **hanpp = NULL;
+       void            *respbufp = NULL, **fshanpp = NULL;
+       dm_fsid_t       fsid, *fsidp = NULL;
+       dm_ino_t        ino, *inop = NULL;
+       char            *cname = NULL, *sessinfop = NULL;
+       char            *path = NULL, *pathbufp = NULL, **versionstrpp = NULL;
+       int             flags = 0, fd = 0, setdtime = 0, reterror = 0;
+       u_int           urc;
+       int             rc;
        dm_ssize_t      ssrc;
 
 /* Definitions per the prototypes in dmport.h, in the same order. */

diff --git a/dmapi/src/suite1/cmd/make_sparse.c b/dmapi/src/suite1/cmd/make_sparse.c
index d16aebaec6fc59ba6b67bddedff5fe0b961e554b..ead7390e2d9da85a387cf289718500ecf13a3249 100644 (file)
--- a/dmapi/src/suite1/cmd/make_sparse.c
+++ b/dmapi/src/suite1/cmd/make_sparse.c
@@ -82,18 +82,18 @@ main(
        for (i = 0; i < 200; i += 2) {
                offset = i * 65536;
                if (lseek(fd, offset, SEEK_SET) < 0) {
-                       fprintf(stderr, "seek to %d failed, %s\n", offset,
+                       fprintf(stderr, "seek to %zd failed, %s\n", offset,
                                strerror(errno));
                        exit(1);
                }
                if ((count = write(fd, buf, buflen)) < 0) {
                        fprintf(stderr, "write of %d bytes failed at offset "
-                               "%d, , %s\n", buflen, offset, strerror(errno));
+                               "%zd, , %s\n", buflen, offset, strerror(errno));
                        exit(1);
                }
                if (count != buflen) {
                        fprintf(stderr, "expected to write %d bytes at offset "
-                               "%d, actually wrote %d\n", buflen, offset,
+                               "%zd, actually wrote %zd\n", buflen, offset,
                                count);
                        exit(1);
                }

diff --git a/dmapi/src/suite1/cmd/obj_ref_hold.c b/dmapi/src/suite1/cmd/obj_ref_hold.c
index c0995470d9eda0f5900425abba3aede136288b12..771deb43730323c39597a5d9df19dc12c1a1b2c5 100644 (file)
--- a/dmapi/src/suite1/cmd/obj_ref_hold.c
+++ b/dmapi/src/suite1/cmd/obj_ref_hold.c
@@ -76,7 +76,8 @@ main(
        char            *name;
        int             opt;
 
-       if (Progname = strrchr(argv[0], '/')) {
+       Progname = strrchr(argv[0], '/');
+       if (Progname) {
                Progname++;
        } else {
                Progname = argv[0];

diff --git a/dmapi/src/suite1/cmd/obj_ref_query.c b/dmapi/src/suite1/cmd/obj_ref_query.c
index a2150e94833588d98d1d63e9a270e9828d1cc894..f85716fae1f2d461b14cdde01495c6d87df191e7 100644 (file)
--- a/dmapi/src/suite1/cmd/obj_ref_query.c
+++ b/dmapi/src/suite1/cmd/obj_ref_query.c
@@ -77,7 +77,8 @@ main(
        int             error;
        int             opt;
 
-       if (Progname = strrchr(argv[0], '/')) {
+       Progname = strrchr(argv[0], '/');
+       if (Progname) {
                Progname++;
        } else {
                Progname = argv[0];

diff --git a/dmapi/src/suite1/cmd/obj_ref_rele.c b/dmapi/src/suite1/cmd/obj_ref_rele.c
index cff486f913ee0a6132ffb8d0290d2b658b81639f..1c39b90a3defcad8ca9ad1d66b9b91331c036ef2 100644 (file)
--- a/dmapi/src/suite1/cmd/obj_ref_rele.c
+++ b/dmapi/src/suite1/cmd/obj_ref_rele.c
@@ -76,7 +76,8 @@ main(
        char            *name;
        int             opt;
 
-       if (Progname = strrchr(argv[0], '/')) {
+       Progname = strrchr(argv[0], '/');
+       if (Progname) {
                Progname++;
        } else {
                Progname = argv[0];

diff --git a/dmapi/src/suite1/cmd/path_to_fshandle.c b/dmapi/src/suite1/cmd/path_to_fshandle.c
index 4c625adf8b6ac00df52577b9732a503819747f60..16563d9a362834fde60bd9d94afe6879b321f0dd 100644 (file)
--- a/dmapi/src/suite1/cmd/path_to_fshandle.c
+++ b/dmapi/src/suite1/cmd/path_to_fshandle.c
@@ -55,7 +55,8 @@ main(
        size_t          fshlen;
        char            buffer[100];
 
-       if (Progname = strrchr(argv[0], '/')) {
+       Progname = strrchr(argv[0], '/');
+       if (Progname) {
                Progname++;
        } else {
                Progname = argv[0];

diff --git a/dmapi/src/suite1/cmd/path_to_handle.c b/dmapi/src/suite1/cmd/path_to_handle.c
index 2263cb52fa4dbcb71fc6fb45effab840a31a8812..546415c1c558d18826c4c6dd99c668576376e718 100644 (file)
--- a/dmapi/src/suite1/cmd/path_to_handle.c
+++ b/dmapi/src/suite1/cmd/path_to_handle.c
@@ -55,7 +55,8 @@ main(
        size_t          hlen;
        char            buffer[100];
 
-       if (Progname = strrchr(argv[0], '/')) {
+       Progname = strrchr(argv[0], '/');
+       if (Progname) {
                Progname++;
        } else {
                Progname = argv[0];

diff --git a/dmapi/src/suite1/cmd/pending.c b/dmapi/src/suite1/cmd/pending.c
index 9a81500340c92cdfc62228e9c383b848725fdb6f..827b61ee8ea21e91f0758b046eb4f56037c24035 100644 (file)
--- a/dmapi/src/suite1/cmd/pending.c
+++ b/dmapi/src/suite1/cmd/pending.c
@@ -58,7 +58,8 @@ main(
        char            *name;
        dm_token_t      token;
 
-       if (Progname = strrchr(argv[0], '/')) {
+       Progname = strrchr(argv[0], '/');
+       if (Progname) {
                Progname++;
        } else {
                Progname = argv[0];