diff options
Diffstat (limited to 'argp')
| -rw-r--r-- | argp/argp-ba.c | 4 | ||||
| -rw-r--r-- | argp/argp-help.c | 8 | ||||
| -rw-r--r-- | argp/argp-parse.c | 4 | ||||
| -rw-r--r-- | argp/argp-pv.c | 4 | ||||
| -rw-r--r-- | argp/argp-pvh.c | 4 |
5 files changed, 11 insertions, 13 deletions
diff --git a/argp/argp-ba.c b/argp/argp-ba.c index 5d58cc6c51..5657c2748e 100644 --- a/argp/argp-ba.c +++ b/argp/argp-ba.c @@ -1,5 +1,5 @@ /* Default definition for ARGP_PROGRAM_BUG_ADDRESS. - Copyright (C) 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader <miles@gnu.ai.mit.edu>. @@ -23,4 +23,4 @@ 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 char *argp_program_bug_address = 0; +const char *argp_program_bug_address; diff --git a/argp/argp-help.c b/argp/argp-help.c index d78060d12c..f5d96fb1ef 100644 --- a/argp/argp-help.c +++ b/argp/argp-help.c @@ -1376,19 +1376,17 @@ argp_args_usage (const struct argp *argp, const struct argp_state *state, if (fdoc) { const char *cp = fdoc; - nl = strchr (cp, '\n'); - if (nl) + nl = __strchrnul (cp, '\n'); + if (*nl != '\0') /* This is a `multi-level' args doc; advance to the correct position as determined by our state in LEVELS, and update LEVELS. */ { int i; multiple = 1; for (i = 0; i < *our_level; i++) - cp = nl + 1, nl = strchr (cp, '\n'); + cp = nl + 1, nl = __strchrnul (cp, '\n'); (*levels)++; } - if (! nl) - nl = cp + strlen (cp); /* Manually do line wrapping so that it (probably) won't get wrapped at any embedded spaces. */ diff --git a/argp/argp-parse.c b/argp/argp-parse.c index e59f614a05..758129aab1 100644 --- a/argp/argp-parse.c +++ b/argp/argp-parse.c @@ -1,5 +1,5 @@ /* Hierarchial argument parsing, layered over getopt - Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader <miles@gnu.ai.mit.edu>. @@ -76,7 +76,7 @@ for one second intervals, decrementing _ARGP_HANG until it's zero. Thus you can force the program to continue by attaching a debugger and setting it to 0 yourself. */ -volatile int _argp_hang = 0; +volatile int _argp_hang; #define OPT_PROGNAME -2 #define OPT_USAGE -3 diff --git a/argp/argp-pv.c b/argp/argp-pv.c index 27d714b361..506107436b 100644 --- a/argp/argp-pv.c +++ b/argp/argp-pv.c @@ -1,5 +1,5 @@ /* Default definition for ARGP_PROGRAM_VERSION. - Copyright (C) 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader <miles@gnu.ai.mit.edu>. @@ -22,4 +22,4 @@ --version is added (unless the ARGP_NO_HELP flag is used), which will print this this string followed by a newline and exit (unless the ARGP_NO_EXIT flag is used). Overridden by ARGP_PROGRAM_VERSION_HOOK. */ -const char *argp_program_version = 0; +const char *argp_program_version; diff --git a/argp/argp-pvh.c b/argp/argp-pvh.c index ed60aa992d..2d0bd39576 100644 --- a/argp/argp-pvh.c +++ b/argp/argp-pvh.c @@ -1,5 +1,5 @@ /* Default definition for ARGP_PROGRAM_VERSION_HOOK. - Copyright (C) 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader <miles@gnu.ai.mit.edu>. @@ -29,4 +29,4 @@ this function with a stream to print the version to and a pointer to the current parsing state, and then exits (unless the ARGP_NO_EXIT flag is used). This variable takes precedent over ARGP_PROGRAM_VERSION. */ -void (*argp_program_version_hook) (FILE *stream, struct argp_state *state) = 0; +void (*argp_program_version_hook) (FILE *stream, struct argp_state *state); |