diff options
| -rw-r--r-- | libshouldbeinlibc/argp-help.c | 10 | ||||
| -rw-r--r-- | libshouldbeinlibc/argp-parse.c | 4 | ||||
| -rw-r--r-- | libshouldbeinlibc/argp.h | 12 |
3 files changed, 13 insertions, 13 deletions
diff --git a/libshouldbeinlibc/argp-help.c b/libshouldbeinlibc/argp-help.c index 4e8bfab5..0d944414 100644 --- a/libshouldbeinlibc/argp-help.c +++ b/libshouldbeinlibc/argp-help.c @@ -156,7 +156,7 @@ fill_in_uparams (const struct argp_state *state) arg++; SKIPWS (arg); } - + if (unspec) if (var[0] == 'n' && var[1] == 'o' && var[2] == '-') { @@ -879,7 +879,7 @@ arg (const struct argp_option *real, const char *req_fmt, const char *opt_fmt, /* Helper functions for hol_entry_help. */ /* State used during the execution of hol_help. */ -struct hol_help_state +struct hol_help_state { /* PREV_ENTRY should contain the previous entry printed, or 0. */ struct hol_entry *prev_entry; @@ -922,7 +922,7 @@ filter_doc (const char *doc, int key, const struct argp *argp, } else /* No filter. */ - return (char *)doc; + return (char *)doc; } /* Prints STR as a header line, with the margin lines set appropiately, and @@ -1543,7 +1543,7 @@ _help (const struct argp *argp, const struct argp_state *state, FILE *stream, { __argp_fmtstream_printf (fs, _("\ Try `%s --help' or `%s --usage' for more information.\n"), - name, name); + name, name); anything = 1; } @@ -1569,7 +1569,7 @@ Try `%s --help' or `%s --usage' for more information.\n"), if (anything) __argp_fmtstream_putc (fs, '\n'); __argp_fmtstream_printf (fs, _("Report bugs to %s.\n"), - argp_program_bug_address); + argp_program_bug_address); anything = 1; } diff --git a/libshouldbeinlibc/argp-parse.c b/libshouldbeinlibc/argp-parse.c index 0382fd4e..edc55168 100644 --- a/libshouldbeinlibc/argp-parse.c +++ b/libshouldbeinlibc/argp-parse.c @@ -576,7 +576,7 @@ parser_init (struct parser *parser, const struct argp *argp, parser->state.argv--, parser->state.argc++; } else - opterr = 1; /* Print error messages. */ + opterr = 1; /* Print error messages. */ if (parser->state.argv == argv && argv[0]) /* There's an argv[0]; use it for messages. */ @@ -755,7 +755,7 @@ parser_parse_next (struct parser *parser, int *arg_ebadkey) /* Give getopt a chance to parse this. */ { optind = parser->state.next; /* Put it back in OPTIND for getopt. */ - optopt = KEY_END; /* Distinguish KEY_ERR from a real option. */ + optopt = KEY_END; /* Distinguish KEY_ERR from a real option. */ if (parser->state.flags & ARGP_LONG_ONLY) opt = getopt_long_only (parser->state.argc, parser->state.argv, parser->short_opts, parser->long_opts, 0); diff --git a/libshouldbeinlibc/argp.h b/libshouldbeinlibc/argp.h index f4b7e4db..61ed8351 100644 --- a/libshouldbeinlibc/argp.h +++ b/libshouldbeinlibc/argp.h @@ -241,7 +241,7 @@ struct argp TEXT is NULL for this key. */ /* Explanatory note emitted when duplicate option arguments have been suppressed. */ -#define ARGP_KEY_HELP_DUP_ARGS_NOTE 0x2000005 +#define ARGP_KEY_HELP_DUP_ARGS_NOTE 0x2000005 #define ARGP_KEY_HELP_ARGS_DOC 0x2000006 /* Argument doc string. */ /* When an argp has a non-zero CHILDREN field, it should point to a vector of @@ -369,11 +369,11 @@ struct argp_state returned. This function may also call exit unless the ARGP_NO_HELP flag is set. INPUT is a pointer to a value to be passed in to the parser. */ extern error_t argp_parse __P ((__const struct argp *__argp, - int __argc, char **__argv, unsigned __flags, - int *__arg_index, void *__input)); + int __argc, char **__argv, unsigned __flags, + int *__arg_index, void *__input)); extern error_t __argp_parse __P ((__const struct argp *__argp, - int __argc, char **__argv, unsigned __flags, - int *__arg_index, void *__input)); + int __argc, char **__argv, unsigned __flags, + int *__arg_index, void *__input)); /* Global variables. */ @@ -396,7 +396,7 @@ extern void (*argp_program_version_hook) __P ((FILE *__stream, argp_help if the ARGP_HELP_BUG_ADDR flag is set (as it is by various standard help messages), embedded in a sentence that says something like `Report bugs to ADDR.'. */ -__const extern char *argp_program_bug_address; +extern __const char *argp_program_bug_address; /* The exit status that argp will use when exiting due to a parsing error. If not defined or set by the user program, this defaults to EX_USAGE from |