diff options
| author | Marko Myllynen <myllynen@redhat.com> | 2016-05-30 07:52:15 +0300 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2016-06-11 01:37:04 -0400 |
| commit | 6a54bcda7a2a64e465992a9984785443fd594743 (patch) | |
| tree | 367a918b9004147383e60a539ed6b95b50d3d300 | |
| parent | 686db256f640372df81242bf20d458f54e069f56 (diff) | |
| download | glibc-6a54bcda7a2a64e465992a9984785443fd594743.tar.gz glibc-6a54bcda7a2a64e465992a9984785443fd594743.tar.xz glibc-6a54bcda7a2a64e465992a9984785443fd594743.zip | |
localedef: drop unused --old-style
The --old-style option for localedef is a no-op and has been for 16 years. Delete the code.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | locale/programs/localedef.c | 9 | ||||
| -rw-r--r-- | locale/programs/localedef.h | 1 |
4 files changed, 8 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index 94caf57615..e62235f5ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2016-06-11 Marko Myllynen <myllynen@redhat.com> + + * locale/programs/localedef.c (oldstyle_tables): Remove. + * locale/programs/localedef.h (oldstyle_tables): Likewise. + 2016-06-10 Joseph Myers <joseph@codesourcery.com> [BZ #20240] diff --git a/NEWS b/NEWS index 9d6ac56d53..4334578c6e 100644 --- a/NEWS +++ b/NEWS @@ -36,6 +36,9 @@ Version 2.24 * The deprecated __malloc_initialize_hook variable has been removed from the API. +* The long unused --old-style flag has been removed. It hasn't done anything + in over 16 years. Scripts using this flag can safely drop it. + Security related changes: * An unnecessary stack copy in _nss_dns_getnetbyname_r was removed. It diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c index bfc5d22eae..b4c48f17f6 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 cb9386a798..daed933e6d 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; |