From patchwork Mon May 30 04:52:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marko Myllynen X-Patchwork-Id: 627606 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rJ4422jGlz9t41 for ; Mon, 30 May 2016 14:52:33 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=ALcTOyV+; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:reply-to:subject:references:to:from:message-id :date:mime-version:in-reply-to:content-type :content-transfer-encoding; q=dns; s=default; b=ws5Zz68wZ7PhRwYt WOhJWtKFGdRj4Kq+IvUOZk/Lku9SWXjousPdJmwDlonpH2N6Apdyo8+er1SCuHlz NfAtgE+fhPPxaC0VebweG53vyWtElmNIr3AzJ4Z0BH9+3ARrSnoNAyxU8i1YMIl9 xvt0tXzHJhqMqLJ6bj8S6WiABTQ= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:reply-to:subject:references:to:from:message-id :date:mime-version:in-reply-to:content-type :content-transfer-encoding; s=default; bh=ERkzGjTO4wnMA9A7tiiNac ju5mY=; b=ALcTOyV+aIa+V1pHbUFGUDyNeS0mlz9cPdIjGF/caAzenV7V9+uwzD jxGZ0HA0/V1MIFRFcMisrW43Yz97GGZFUupJubvu6umwy2Xi2cMM92Va2XPVLBfB b5CxmSWBshFAIpuekJbLW8TmQmbe9tH5bLUOG/kaB3jiSWgDc0BQU= Received: (qmail 94548 invoked by alias); 30 May 2016 04:52:26 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 94538 invoked by uid 89); 30 May 2016 04:52:25 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 spammy=*state, 1236, Hx-spam-relays-external:!192.168.1.100!, H*RU:74.125.82.47 X-HELO: mail-wm0-f47.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:reply-to:subject:references:to:from:organization :message-id:date:user-agent:mime-version:in-reply-to :content-transfer-encoding; bh=Pwp1YtMDbD6BhJ11GfXBcKAdQkOx3Jn9hxkgPZma7M8=; b=eP5NNn9fQnIUsrG8tN9TVDK4WJn4TmUsjcsZy8eLQ+v+XeCi7aX6koZelRnrb9XUew 0ddm8T0+OpsfkVZIGDB3EkgszoKHUrVAtzhZ71EpsYOcRmjvuUxlaHwJRfdpJ5omwHUS /VflEG2EBHB+3rn/aj9J9WHMC/o2CXiCqaAgHMZyKloo+BsS51jx2ySUDML0q8eqy+r7 WQrSoPUx0hWzC8lVJK4+9XKcGDMHg7Ppfaj1YnYuTrJfQvroFm8P8mOq28El31O+C5O5 ZXiw+3VjsWsrDrGETYsRJ4/9a92TxV3oAZsYmPoEgMU+682wDiWDf7Dw7yuquxU5UbFD FQ3g== X-Gm-Message-State: ALyK8tL2yIIItMzrYN3Q4nuYg/y4dr+Lj7QVVCd2kx82VZYgiMpRhRukwbbUVA5AbFosN+rt X-Received: by 10.28.230.200 with SMTP id e69mr3719732wmi.53.1464583941027; Sun, 29 May 2016 21:52:21 -0700 (PDT) Reply-To: Marko Myllynen Subject: Re: [PATCH] localedef --old-style is a no-op References: <574835CB.5000401@redhat.com> <20160527181644.GK26300@vapier.lan> To: GNU C Library From: Marko Myllynen Message-ID: <574BC6FF.5030007@redhat.com> Date: Mon, 30 May 2016 07:52:15 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.8.0 MIME-Version: 1.0 In-Reply-To: <20160527181644.GK26300@vapier.lan> 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 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, 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;