Changeset b5143bd in mainline for uspace/lib/c/generic/getopt.c

Timestamp:

2015-06-06T01:50:56Z (9 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0453261

Parents:

94e46c9 (diff), 87a2f9b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

mainline changes

File:

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

uspace/lib/c/generic/getopt.c

@@ -95 +95 @@
  * Compute the greatest common divisor of a and b.
  */
-static int
-gcd(a, b)
-        int a;
-        int b;
+static int gcd(int a, int b)
 {
         int c;
-
+        
         c = a % b;
         while (c != 0) {
@@ -108 +105 @@
                 c = a % b;
         }
-           
+        
         return b;
 }
@@ -117 +114 @@
  * in each block).
  */
-static void
-permute_args(panonopt_start, panonopt_end, opt_end, nargv)
-        int panonopt_start;
-        int panonopt_end;
-        int opt_end;
-        char **nargv;
+static void permute_args(int panonopt_start, int panonopt_end, int opt_end,
+    char **nargv)
 {
         int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos;
@@ -157 +150 @@
  *  Returns -2 if -- is found (can be long option or end of options marker).
  */
-static int
-getopt_internal(nargc, nargv, options)
-        int nargc;
-        char **nargv;
-        const char *options;
+static int getopt_internal(int nargc, char **nargv, const char *options)
 {
         const char *oli;                                /* option letter list index */
@@ -299 +288 @@
  *      Parse argc/argv argument vector.
  */
-int
-getopt(nargc, nargv, options)
-        int nargc;
-        char * const *nargv;
-        const char *options;
+int getopt(int nargc, char * const *nargv, const char *options)
 {
         int retval;
@@ -332 +317 @@
  *      Parse argc/argv argument vector.
  */
-int
-getopt_long(nargc, nargv, options, long_options, idx)
-        int nargc;
-        char * const *nargv;
-        const char *options;
-        const struct option *long_options;
-        int *idx;
+int getopt_long(int nargc, char * const *nargv, const char *options,
+    const struct option *long_options, int *idx)
 {
         int retval;