INTEGRATION: CWS ooo20040329 (1.1.92); FILE MERGED

2004/03/17 12:40:59 waratah 1.1.92.1: #i1858# add explicit int type where needed
include extra braces to make code more obvious for debugging

soltools/cpp/_getopt.c

@@ -13,10 +13,11 @@ int
     getopt(int argc, char *const argv[], const char *opts)
 {
     static int sp = 1;
-    register c;
+    register int c;
     register char *cp;
 
     if (sp == 1)
+    {
         if (optind >= argc ||
             argv[optind][0] != '-' || argv[optind][1] == '\0')
             return -1;
@@ -26,6 +27,7 @@ int
                 optind++;
                 return -1;
             }
+    }
     optopt = c = argv[optind][sp];
     if (c == ':' || (cp = strchr(opts, c)) == 0)
     {