Changeset db24058 in mainline for uspace/lib/libc/generic/getopt.c

Timestamp:

2009-06-30T15:53:15Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

2d11a7d8

Parents:

6db6fd1

Message:

small fixes and coding style changes related to the new memory allocator

File:

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

uspace/lib/libc/generic/getopt.c

@@ -48 +48 @@
 int     optopt = '?';           /* character checked for validity */
 int     optreset;               /* reset getopt */
-char *optarg;           /* argument associated with option */
+const char *optarg;             /* argument associated with option */
 
 
@@ -163 +163 @@
         const char *options;
 {
-        char *oli;                              /* option letter list index */
+        const char *oli;                                /* option letter list index */
         int optchar;
 
@@ -276 +276 @@
                 optarg = NULL;
                 if (*place)                     /* no white space */
-                        optarg = *place;
+                        optarg = place;
                 /* XXX: disable test for :: if PC? (GNU doesn't) */
                 else if (oli[1] != ':') {       /* arg not optional */
@@ -354 +354 @@
         retval = getopt_internal(nargc, (char **)nargv, options);
         if (retval == -2) {
-                char *current_argv, *has_equal;
+                char *current_argv;
+                const char *has_equal;
                 size_t current_argv_len;
                 int i, ambiguous, match;