From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id C7335384802E for ; Tue, 22 Jun 2021 03:23:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C7335384802E Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-185-niRP6q9eMZSiCPnpNEuVdQ-1; Mon, 21 Jun 2021 23:23:09 -0400 X-MC-Unique: niRP6q9eMZSiCPnpNEuVdQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D55E61835AC9; Tue, 22 Jun 2021 03:23:07 +0000 (UTC) Received: from greed.delorie.com (ovpn-112-111.rdu2.redhat.com [10.10.112.111]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 727C21000320; Tue, 22 Jun 2021 03:23:07 +0000 (UTC) Received: from greed.delorie.com.redhat.com (localhost [127.0.0.1]) by greed.delorie.com (8.15.2/8.15.2) with ESMTP id 15M3N5ip408355; Mon, 21 Jun 2021 23:23:06 -0400 From: DJ Delorie To: Siddhesh Poyarekar Cc: libc-alpha@sourceware.org, adhemerval.zanella@linaro.org, schwab@linux-m68k.org Subject: Re: [PATCH 2/6] gconv_conf: Remove unused variables In-Reply-To: <20210610111853.2286873-3-siddhesh@sourceware.org> Date: Mon, 21 Jun 2021 23:23:05 -0400 Message-ID: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jun 2021 03:23:12 -0000 Siddhesh Poyarekar writes: > The modules and nmodules parameters passed to add_modules, add_alias, > etc. are not used and are hence unnecessary. Remove them so that > their signatures match the functions in iconvconfig. > --- > iconv/gconv_conf.c | 24 ++++++++++-------------- > 1 file changed, 10 insertions(+), 14 deletions(-) > > diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c > index 3f2cef255b..6c6625c37a 100644 > --- a/iconv/gconv_conf.c > +++ b/iconv/gconv_conf.c > @@ -132,7 +132,7 @@ detect_conflict (const char *alias) > > /* The actual code to add aliases. */ > static void > -add_alias2 (const char *from, const char *to, const char *wp, void *modules) > +add_alias2 (const char *from, const char *to, const char *wp) Drop modules, ok. > -add_alias (char *rp, void *modules) > +add_alias (char *rp) Likewise. Ok. > - add_alias2 (from, to, wp, modules); > + add_alias2 (from, to, wp); Likewise. Ok. > @@ -250,8 +250,7 @@ insert_module (struct gconv_module *newp, int tobefreed) > > /* Add new module. */ > static void > -add_module (char *rp, const char *directory, size_t dir_len, void **modules, > - size_t *nmodules, int modcounter) > +add_module (char *rp, const char *directory, size_t dir_len, int modcounter) Likewise, ok. > -read_conf_file (const char *filename, const char *directory, size_t dir_len, > - void **modules, size_t *nmodules) > +read_conf_file (const char *filename, const char *directory, size_t dir_len) Likewise, ok. > - add_alias (rp, *modules); > + add_alias (rp); > else if (rp - word == sizeof ("module") - 1 > && memcmp (word, "module", sizeof ("module") - 1) == 0) > - add_module (rp, directory, dir_len, modules, nmodules, modcounter++); > + add_module (rp, directory, dir_len, modcounter++); Ok. > static void > __gconv_read_conf (void) > { > - void *modules = NULL; > - size_t nmodules = 0; Don't use them, don't need them. Ok. > - read_conf_file (buf, elem, elem_len, &modules, &nmodules); > + read_conf_file (buf, elem, elem_len); Ok. > - read_conf_file (conf, elem, elem_len, &modules, &nmodules); > + read_conf_file (conf, elem, elem_len); Ok. > - add_alias2 (from, to, cp, modules); > + add_alias2 (from, to, cp); Ok. LGTM. Reviewed-by: DJ Delorie