This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] localedef --old-style is a no-op
- From: Marko Myllynen <myllynen at redhat dot com>
- To: GNU C Library <libc-alpha at sourceware dot org>
- Date: Fri, 27 May 2016 14:55:55 +0300
- Subject: [PATCH] localedef --old-style is a no-op
- Authentication-results: sourceware.org; auth=none
- Reply-to: Marko Myllynen <myllynen at redhat dot com>
Hi,
The --old-style option for localedef is a no-op. Is the patch below to
reflect this worth the effort (considering translations) or should we
leave it as is? (I've already submitted a patch to man pages upstream
to adjust the localedef(1) man page.)
2016-05-27 Marko Myllynen <myllynen@redhat.com>
* locale/programs/localedef.c (oldstyle_tables): Remove.
* locale/programs/localedef.h (oldstyle_tables): Likewise.
Update old-style command line option description.
---
locale/programs/localedef.c | 7 +------
locale/programs/localedef.h | 1 -
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
index bfc5d22..546d2cd 100644
--- a/locale/programs/localedef.c
+++ b/locale/programs/localedef.c
@@ -54,10 +54,6 @@ int verbose;
/* If not zero suppress warnings and information messages. */
int be_quiet;
-/* If not zero, produce old-style hash table instead of 3-level access
- tables. */
-int oldstyle_tables;
-
/* If not zero force output even if warning were issued. */
static int force_output;
@@ -128,7 +124,7 @@ static const struct argp_option options[] =
{ NULL, 0, NULL, 0, N_("Output control:") },
{ "force", 'c', NULL, 0,
N_("Create output even if warning messages were issued") },
- { "old-style", OPT_OLDSTYLE, NULL, 0, N_("Create old-style tables") },
+ { "old-style", OPT_OLDSTYLE, NULL, 0, N_("Ignored, for backwards compatibility only") },
{ "prefix", OPT_PREFIX, N_("PATH"), 0, N_("Optional output file prefix") },
{ "posix", OPT_POSIX, NULL, 0, N_("Strictly conform to POSIX") },
{ "quiet", OPT_QUIET, NULL, 0,
@@ -311,7 +307,6 @@ parse_opt (int key, char *arg, struct argp_state *state)
posix_conformance = 1;
break;
case OPT_OLDSTYLE:
- oldstyle_tables = 1;
break;
case OPT_PREFIX:
output_prefix = arg;
diff --git a/locale/programs/localedef.h b/locale/programs/localedef.h
index cb9386a..daed933 100644
--- a/locale/programs/localedef.h
+++ b/locale/programs/localedef.h
@@ -112,7 +112,6 @@ struct localedef_t
/* Global variables of the localedef program. */
extern int verbose;
extern int be_quiet;
-extern int oldstyle_tables;
extern const char *repertoire_global;
extern int max_locarchive_open_retry;
extern bool no_archive;
Thanks,
--
Marko Myllynen