diff mbox

localedef --old-style is a no-op

Message ID 574BC6FF.5030007@redhat.com
State New
Headers show

Commit Message

Marko Myllynen May 30, 2016, 4:52 a.m. UTC
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(-)


Thanks,

Comments

Mike Frysinger May 31, 2016, 8:50 p.m. UTC | #1
On 30 May 2016 07:52, Marko Myllynen wrote:
> 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.)

looks fine to me
-mike
Joseph Myers June 2, 2016, 10:31 p.m. UTC | #2
On Mon, 30 May 2016, Marko Myllynen wrote:

> 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.)

In my view such a feature removal (even of a no-op feature) merits a NEWS 
entry as well.
Mike Frysinger June 3, 2016, 2:16 a.m. UTC | #3
On 02 Jun 2016 22:31, Joseph Myers wrote:
> On Mon, 30 May 2016, Marko Myllynen wrote:
> > 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.)
> 
> In my view such a feature removal (even of a no-op feature) merits a NEWS 
> entry as well.

np.  if no one else has concerns, i can take of merging it.
-mike
Mike Frysinger June 11, 2016, 5:44 a.m. UTC | #4
On 02 Jun 2016 22:16, Mike Frysinger wrote:
> On 02 Jun 2016 22:31, Joseph Myers wrote:
> > On Mon, 30 May 2016, Marko Myllynen wrote:
> > > 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.)
> > 
> > In my view such a feature removal (even of a no-op feature) merits a NEWS 
> > entry as well.
> 
> np.  if no one else has concerns, i can take of merging it.

done!
-mike
diff mbox

Patch

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;