From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 13 Sep 2004 05:28:45 +0000 (+0000)
Subject: Simplify help message printing.
X-Git-Tag: upstream/2.30~17532
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9d9ab48728080f0cd9b8a38346f2b4842d057c33;p=external%2Fglibc.git

Simplify help message printing.
---

diff --git a/locale/programs/locale.c b/locale/programs/locale.c
index dede36d..adf9944 100644
--- a/locale/programs/locale.c
+++ b/locale/programs/locale.c
@@ -85,7 +85,9 @@ static const struct argp_option options[] =
 };
 
 /* Short description of program.  */
-static const char doc[] = N_("Get locale-specific information.");
+static const char doc[] = N_("Get locale-specific information.\v\
+For bug reporting instructions, please see:\n\
+<http://www.gnu.org/software/libc/bugs.html>.\n");
 
 /* Strings for arguments in help texts.  */
 static const char args_doc[] = N_("NAME\n[-a|-m]");
@@ -93,13 +95,10 @@ static const char args_doc[] = N_("NAME\n[-a|-m]");
 /* Prototype for option handler.  */
 static error_t parse_opt (int key, char *arg, struct argp_state *state);
 
-/* Function to print some extra text in the help message.  */
-static char *more_help (int key, const char *text, void *input);
-
 /* Data structure to communicate with argp functions.  */
 static struct argp argp =
 {
-  options, parse_opt, args_doc, doc, NULL, more_help
+  options, parse_opt, args_doc, doc
 };
 
 
@@ -269,22 +268,6 @@ parse_opt (int key, char *arg, struct argp_state *state)
 }
 
 
-static char *
-more_help (int key, const char *text, void *input)
-{
-  switch (key)
-    {
-    case ARGP_KEY_HELP_EXTRA:
-      /* We print some extra information.  */
-      return xstrdup (gettext ("\
-For bug reporting instructions, please see:\n\
-<http://www.gnu.org/software/libc/bugs.html>.\n"));
-    default:
-      break;
-    }
-  return (char *) text;
-}
-
 /* Print the version information.  */
 static void
 print_version (FILE *stream, struct argp_state *state)