Changeset 3bacee1 in mainline for uspace/lib/c/generic/getopt.c

Timestamp:

2018-04-12T16:27:17Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

3cf22f9

Parents:

76d0981d

git-author:

Jiri Svoboda <jiri@…> (2018-04-11 19:25:33)

git-committer:

Jiri Svoboda <jiri@…> (2018-04-12 16:27:17)

Message:

Make ccheck-fix again and commit more good files.

File:

• uspace/lib/c/generic/getopt.c (modified) (8 diffs)

uspace/lib/c/generic/getopt.c

@@ -132 +132 @@
 
         for (i = 0; i < ncycle; i++) {
-                cstart = panonopt_end+i;
+                cstart = panonopt_end + i;
                 pos = cstart;
                 for (j = 0; j < cyclelen; j++) {
@@ -181 +181 @@
                                     optind, nargv);
                                 optind -= nonopt_end - nonopt_start;
-                        }
-                        else if (nonopt_start != -1) {
+                        } else if (nonopt_start != -1) {
                                 /*
                                  * If we skipped non-options, set optind
@@ -192 +191 @@
                         return -1;
                 }
-                if ((*(place = nargv[optind]) != '-')
-                    || (place[1] == '\0')) {    /* found non-option */
+                if ((*(place = nargv[optind]) != '-') ||
+                    (place[1] == '\0')) {    /* found non-option */
                         place = EMSG;
                         if (IN_ORDER) {
@@ -289 +288 @@
  *      Parse argc/argv argument vector.
  */
-int getopt(int nargc, char * const *nargv, const char *options)
+int getopt(int nargc, char *const *nargv, const char *options)
 {
         int retval;
@@ -305 +304 @@
                 if (nonopt_end != -1) {
                         permute_args(nonopt_start, nonopt_end, optind,
-                                       (char **)nargv);
+                            (char **)nargv);
                         optind -= nonopt_end - nonopt_start;
                 }
@@ -318 +317 @@
  *      Parse argc/argv argument vector.
  */
-int getopt_long(int nargc, char * const *nargv, const char *options,
+int getopt_long(int nargc, char *const *nargv, const char *options,
     const struct option *long_options, int *idx)
 {
@@ -389 +388 @@
                         if (PRINT_ERROR)
                                 printf(ambig, (int)current_argv_len,
-                                     current_argv);
+                                    current_argv);
                         optopt = 0;
                         return BADCH;
                 }
                 if (match != -1) {                      /* option found */
-                        if (long_options[match].has_arg == no_argument
-                            && has_equal) {
+                        if (long_options[match].has_arg == no_argument &&
+                            has_equal) {
                                 if (PRINT_ERROR)
                                         printf(noarg, (int)current_argv_len,
-                                             current_argv);
+                                            current_argv);
                                 /*
                                  * XXX: GNU sets optopt to val regardless of
@@ -422 +421 @@
                                 }
                         }
-                        if ((long_options[match].has_arg == required_argument)
-                            && (optarg == NULL)) {
+                        if ((long_options[match].has_arg == required_argument) &&
+                            (optarg == NULL)) {
                                 /*
                                  * Missing argument; leading ':'