LU-3069 build: fix 'integer handling' issues

[fs/lustre-release.git] / lustre / utils / liblustreapi.c

diff --git a/lustre/utils/liblustreapi.c b/lustre/utils/liblustreapi.c
index 818d54c..05e9929 100644 (file)
--- a/lustre/utils/liblustreapi.c
+++ b/lustre/utils/liblustreapi.c
@@ -170,8 +170,8 @@ void llapi_printf(int level, char *fmt, ...)
 /**
  * size_units is to be initialized (or zeroed) by caller.
  */
-int parse_size(char *optarg, unsigned long long *size,
-               unsigned long long *size_units, int bytes_spec)
+int llapi_parse_size(const char *optarg, unsigned long long *size,
+                    unsigned long long *size_units, int bytes_spec)
 {
         char *end;
 
@@ -759,7 +759,8 @@ int llapi_dir_create_pool(const char *name, int flags, int stripe_offset,
                        llapi_err_noerrno(LLAPI_MSG_ERROR,
                                  "error LL_IOC_LMV_SETSTRIPE '%s' : too large"
                                  "pool name: %s", name, pool_name);
-                       GOTO(out, rc = -E2BIG);
+                       rc = -E2BIG;
+                       goto out;
                }
                memcpy(lmu.lum_pool_name, pool_name, strlen(pool_name));
        }
@@ -777,14 +778,14 @@ int llapi_dir_create_pool(const char *name, int flags, int stripe_offset,
                llapi_error(LLAPI_MSG_ERROR, rc,
                            "error: LL_IOC_LMV_SETSTRIPE pack failed '%s'.",
                            name);
-               GOTO(out, rc);
+               goto out;
        }
 
        fd = open(dir, O_DIRECTORY | O_RDONLY);
        if (fd < 0) {
                rc = -errno;
                llapi_error(LLAPI_MSG_ERROR, rc, "unable to open '%s'", name);
-               GOTO(out, rc);
+               goto out;
        }
 
        if (ioctl(fd, LL_IOC_LMV_SETSTRIPE, buf)) {
@@ -827,7 +828,7 @@ int llapi_direntry_remove(char *dname)
                rc = -errno;
                llapi_error(LLAPI_MSG_ERROR, rc, "unable to open '%s'",
                            filename);
-               GOTO(out, rc);
+               goto out;
        }
 
        if (ioctl(fd, LL_IOC_REMOVE_ENTRY, filename)) {
@@ -1475,15 +1476,19 @@ static int llapi_semantic_traverse(char *path, int size, DIR *parent,
         } else if (!d && !parent) {
                 /* ENOTDIR. Open the parent dir. */
                 p = opendir_parent(path);
-                if (!p)
-                        GOTO(out, ret = -errno);
+               if (!p) {
+                       ret = -errno;
+                       goto out;
+               }
         }
 
         if (sem_init && (ret = sem_init(path, parent ?: p, d, data, de)))
                 goto err;
 
-       if (!d || (param->get_lmv && !param->recursive))
-               GOTO(out, ret = 0);
+       if (!d || (param->get_lmv && !param->recursive)) {
+               ret = 0;
+               goto out;
+       }
 
        while ((dent = readdir64(d)) != NULL) {
                param->have_fileinfo = 0;
@@ -1824,7 +1829,8 @@ static int setup_indexes(DIR *dir, char *path, struct obd_uuid *obduuids,
                          int num_obds, int **obdindexes, int *obdindex,
                          enum tgt_type type)
 {
-        int ret, obdcount, obd_valid = 0, obdnum, i;
+       int ret, obdcount, obd_valid = 0, obdnum;
+       long i;
         struct obd_uuid *uuids = NULL;
         char buf[16];
         int *indexes;
@@ -3788,7 +3794,8 @@ int root_ioctl(const char *mdtname, int opc, void *data, int *mdtidxp,
 {
         char fsname[20];
         char *ptr;
-        int fd, index, rc;
+       int fd, rc;
+       long index;
 
         /* Take path, fsname, or MDTname.  Assume MDT0000 in the former cases.
          Open root and parse mdt index. */
@@ -4008,7 +4015,7 @@ int llapi_changelog_free(struct changelog_ext_rec **rech)
 int llapi_changelog_clear(const char *mdtname, const char *idstr,
                           long long endrec)
 {
-        int id;
+       long id;
 
         if (endrec < 0) {
                 llapi_err_noerrno(LLAPI_MSG_ERROR,