qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

localedef: drop unused --old-style 

The --old-style option for localedef is a no-op and has been for 16
years.  Delete the code.
This commit is contained in:
Marko Myllynen 2016-05-30 07:52:15 +03:00 committed by Mike Frysinger
parent 686db256f6
commit 6a54bcda7a
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 2016-06-10 Joseph Myers <joseph@codesourcery.com>
[BZ #20240] [BZ #20240]

3
NEWS
View File

@ -36,6 +36,9 @@ Version 2.24
* The deprecated __malloc_initialize_hook variable has been removed from the * The deprecated __malloc_initialize_hook variable has been removed from the
API. 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: Security related changes:
* An unnecessary stack copy in _nss_dns_getnetbyname_r was removed. It * An unnecessary stack copy in _nss_dns_getnetbyname_r was removed. It

9
locale/programs/localedef.c
View File

@ -54,10 +54,6 @@ int verbose;
/* If not zero suppress warnings and information messages. */ /* If not zero suppress warnings and information messages. */
int be_quiet; 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. */ /* If not zero force output even if warning were issued. */
static int force_output; 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_POSIX 301
#define OPT_QUIET 302 #define OPT_QUIET 302
#define OPT_OLDSTYLE 303
#define OPT_PREFIX 304 #define OPT_PREFIX 304
#define OPT_NO_ARCHIVE 305 #define OPT_NO_ARCHIVE 305
#define OPT_ADD_TO_ARCHIVE 306 #define OPT_ADD_TO_ARCHIVE 306
@ -128,7 +123,6 @@ static const struct argp_option options[] =
{ NULL, 0, NULL, 0, N_("Output control:") }, { NULL, 0, NULL, 0, N_("Output control:") },
{ "force", 'c', NULL, 0, { "force", 'c', NULL, 0,
N_("Create output even if warning messages were issued") }, 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") }, { "prefix", OPT_PREFIX, N_("PATH"), 0, N_("Optional output file prefix") },
{ "posix", OPT_POSIX, NULL, 0, N_("Strictly conform to POSIX") }, { "posix", OPT_POSIX, NULL, 0, N_("Strictly conform to POSIX") },
{ "quiet", OPT_QUIET, NULL, 0, { "quiet", OPT_QUIET, NULL, 0,
@ -310,9 +304,6 @@ parse_opt (int key, char *arg, struct argp_state *state)
case OPT_POSIX: case OPT_POSIX:
posix_conformance = 1; posix_conformance = 1;
break; break;
case OPT_OLDSTYLE:
oldstyle_tables = 1;
break;
case OPT_PREFIX: case OPT_PREFIX:
output_prefix = arg; output_prefix = arg;
break; break;

1
locale/programs/localedef.h
View File

@ -112,7 +112,6 @@ struct localedef_t
/* Global variables of the localedef program. */ /* Global variables of the localedef program. */
extern int verbose; extern int verbose;
extern int be_quiet; extern int be_quiet;
extern int oldstyle_tables;
extern const char *repertoire_global; extern const char *repertoire_global;
extern int max_locarchive_open_retry; extern int max_locarchive_open_retry;
extern bool no_archive; extern bool no_archive;