b=15534

i=rahul
i=tappro

	use integer to check getopt_long() return val, fixes error checking on ppc platform

diff --git a/lustre/tests/mpi/mdsrate.c b/lustre/tests/mpi/mdsrate.c
index 097d4a8..dece833 100644 (file)
--- a/lustre/tests/mpi/mdsrate.c
+++ b/lustre/tests/mpi/mdsrate.c
@@ -244,7 +244,7 @@ int llapi_file_lookup(int dirfd, const char *name)
 static void
 process_args(int argc, char *argv[])
 {
-        char   c, *cp, *endptr;
+        char   *cp, *endptr;
         int    i, index, offset, tmpend, rc;
         char   tmp[16];
         FILE * seed_file;
@@ -263,8 +263,8 @@ process_args(int argc, char *argv[])
                         *++cp = ':';
         }
 
-        while ((c = getopt_long(argc,argv, shortOpts, longOpts,&index)) != -1) {
-                switch (c) {
+        while ((rc = getopt_long(argc,argv, shortOpts, longOpts,&index)) != -1) {
+                switch (rc) {
                 case OPEN:
                         openflags &= ~(O_CREAT|O_EXCL);
                 case CREATE:
@@ -279,7 +279,7 @@ process_args(int argc, char *argv[])
                                            "specified: --%s\n",
                                         longOpts[index].name);
                         }
-                        mode = c;
+                        mode = rc;
                         cmd = (char *)longOpts[index].name;
                         break;
                 case NOEXCL:
@@ -404,7 +404,7 @@ process_args(int argc, char *argv[])
                                          "--lookup, --open, or --stat.\n",
                                       (char *)longOpts[index].name);
                         }
-                        order = c;
+                        order = rc;
                         break;
                 case IGNORE:
                         ++ignore;

diff --git a/lustre/tests/mpi/parallel_grouplock.c b/lustre/tests/mpi/parallel_grouplock.c
index 1946b39..e572e4e 100644 (file)
--- a/lustre/tests/mpi/parallel_grouplock.c
+++ b/lustre/tests/mpi/parallel_grouplock.c
@@ -960,8 +960,7 @@ void usage(char *proc)
 
 int main(int argc, char *argv[])
 {
-        char c;
-        int i, iterations = 1;
+        int i, iterations = 1, c;
 
         setbuf(stdout, 0);
         setbuf(stderr, 0);

diff --git a/lustre/tests/statmany.c b/lustre/tests/statmany.c
index 7c60418..3e24cdf 100644 (file)
--- a/lustre/tests/statmany.c
+++ b/lustre/tests/statmany.c
@@ -77,16 +77,16 @@ static int usage(char *prog, FILE *out)
 
 int main(int argc, char ** argv)
 {
-        long i, c, count, iter = LONG_MAX, mode = 0, offset;
-        long int start, length = LONG_MAX, last, rc = 0;
+        long i, count, iter = LONG_MAX, mode = 0, offset;
+        long int start, length = LONG_MAX, last;
         char parent[4096], *t;
        char *prog = argv[0], *base;
-       int seed = 0;
+       int seed = 0, rc;
        int fd = -1;
 
-       while ((c = getopt_long(argc, argv, shortopts, longopts, NULL)) != -1) {
+       while ((rc = getopt_long(argc, argv, shortopts, longopts, NULL)) != -1) {
                char *e;
-               switch (c) {
+               switch (rc) {
                case 'r':
                        seed = strtoul(optarg, &e, 0);
                        if (*e) {
@@ -97,7 +97,7 @@ int main(int argc, char ** argv)
                case 'e':
                case 'l':
                case 's':
-                       mode = c;
+                       mode = rc;
                        break;
                case '0':
                case '1':
@@ -110,9 +110,9 @@ int main(int argc, char ** argv)
                case '8':
                case '9':
                        if (length == LONG_MAX)
-                               length = c - '0';
+                               length = rc - '0';
                        else
-                               length = length * 10 + (c - '0');
+                               length = length * 10 + (rc - '0');
                        break;
                case 'h':
                        usage(prog, stdout);

diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c
index c5ba917..c2dc968 100644 (file)
--- a/lustre/utils/lfs.c
+++ b/lustre/utils/lfs.c
@@ -2310,7 +2310,7 @@ static int lfs_changelog(int argc, char **argv)
         void *changelog_priv;
         struct changelog_rec *rec;
         long long startrec = 0, endrec = 0;
-        char c, *mdd;
+        char *mdd;
         struct option long_opts[] = {
                 {"follow", no_argument, 0, 'f'},
                 {0, 0, 0, 0}
@@ -2319,9 +2319,9 @@ static int lfs_changelog(int argc, char **argv)
         int rc, follow = 0;
 
         optind = 0;
-        while ((c = getopt_long(argc, argv, short_opts,
+        while ((rc = getopt_long(argc, argv, short_opts,
                                 long_opts, NULL)) != -1) {
-                switch (c) {
+                switch (rc) {
                 case 'f':
                         follow++;
                         break;
@@ -2400,7 +2400,7 @@ static int lfs_fid2path(int argc, char **argv)
                 {"rec", required_argument, 0, 'r'},
                 {0, 0, 0, 0}
         };
-        char c, short_opts[] = "cl:r:";
+        char  short_opts[] = "cl:r:";
         char *device, *fid, *path;
         long long recno = -1;
         int linkno = -1;
@@ -2409,9 +2409,10 @@ static int lfs_fid2path(int argc, char **argv)
         int rc;
 
         optind = 0;
-        while ((c = getopt_long(argc, argv, short_opts,
+
+        while ((rc = getopt_long(argc, argv, short_opts,
                                 long_opts, NULL)) != -1) {
-                switch (c) {
+                switch (rc) {
                 case 'c':
                         printcur++;
                         break;
@@ -2429,7 +2430,6 @@ static int lfs_fid2path(int argc, char **argv)
                         return CMD_HELP;
                 }
         }
-
         device = argv[optind++];
         fid = argv[optind++];
         if (optind != argc)

diff --git a/lustre/utils/llverfs.c b/lustre/utils/llverfs.c
index 975fe52..3f65d55 100644 (file)
--- a/lustre/utils/llverfs.c
+++ b/lustre/utils/llverfs.c
@@ -498,10 +498,10 @@ int main(int argc, char **argv)
        FILE *countfile = NULL;
        char filecount[PATH_MAX];
        unsigned long dir_num = 0, dir_num_orig = 0;/* starting directory */
-       char c;
+       int c;
 
        progname = strrchr(argv[0], '/') ? strrchr(argv[0], '/') + 1 : argv[0];
-       while ((c = (char)getopt_long(argc, argv, "t:rwvplo:h",
+       while ((c = getopt_long(argc, argv, "t:rwvplo:h",
                                      longopts, NULL)) != -1) {
                switch (c) {
                case 'c':

diff --git a/lustre/utils/lreplicate.c b/lustre/utils/lreplicate.c
index c4ee8f8..da88342 100644 (file)
--- a/lustre/utils/lreplicate.c
+++ b/lustre/utils/lreplicate.c
@@ -1477,7 +1477,6 @@ termination_handler (int signum)
 
 int main(int argc, char *argv[])
 {
-        char c;
         int newsize;
         int numtargets = 0;
         int rc = 0;
@@ -1485,9 +1484,9 @@ int main(int argc, char *argv[])
         if ((rc = lr_init_status()) != 0)
                 return rc;
 
-        while ((c = getopt_long(argc, argv, "as:t:m:u:l:vx:zc:ry:n:d:",
+        while ((rc = getopt_long(argc, argv, "as:t:m:u:l:vx:zc:ry:n:d:",
                                 long_opts, NULL)) >= 0) {
-                switch (c) {
+                switch (rc) {
                 case 'a':
                         /* Assume absolute paths */
                         abort_on_err++;