This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [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: Mon, 30 May 2016 07:52:15 +0300
- Subject: Re: [PATCH] localedef --old-style is a no-op
- Authentication-results: sourceware.org; auth=none
- References: <574835CB dot 5000401 at redhat dot com> <20160527181644 dot GK26300 at vapier dot lan>
- Reply-to: Marko Myllynen <myllynen at redhat dot com>
Hi,
On 2016-05-27 21:16, Mike Frysinger wrote:
> On 27 May 2016 14:55, Marko Myllynen wrote:
>> 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.)
>
> this code has been dead for 16 years afaict. i think that's more than
> enough time to let people update their scripts, so let's just drop the
> option entirely.
Ok, how about the patch below? (Please fine-tune the ChangeLog entry if
needed.)
2016-05-30 Marko Myllynen <myllynen@redhat.com>
Remove localedef --old-style option.
* locale/programs/localedef.c (oldstyle_tables): Remove.
* locale/programs/localedef.h (oldstyle_tables): Likewise.
---
locale/programs/localedef.c | 9 ---------
locale/programs/localedef.h | 1 -
2 files changed, 10 deletions(-)
diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
index bfc5d22..b4c48f1 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;
@@ -104,7 +100,6 @@ void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version;
#define OPT_POSIX 301
#define OPT_QUIET 302
-#define OPT_OLDSTYLE 303
#define OPT_PREFIX 304
#define OPT_NO_ARCHIVE 305
#define OPT_ADD_TO_ARCHIVE 306
@@ -128,7 +123,6 @@ 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") },
{ "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,
@@ -310,9 +304,6 @@ parse_opt (int key, char *arg, struct argp_state *state)
case OPT_POSIX:
posix_conformance = 1;
break;
- case OPT_OLDSTYLE:
- oldstyle_tables = 1;
- break;
case OPT_PREFIX:
output_prefix = arg;
break;
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