From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from quail.birch.relay.mailchannels.net (quail.birch.relay.mailchannels.net [23.83.209.151]) by sourceware.org (Postfix) with ESMTPS id D5E593945C10 for ; Tue, 22 Jun 2021 05:12:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D5E593945C10 X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 780BC922D6B; Tue, 22 Jun 2021 05:12:29 +0000 (UTC) Received: from pdx1-sub0-mail-a46.g.dreamhost.com (100-98-55-86.trex.outbound.svc.cluster.local [100.98.55.86]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id CA503922D53; Tue, 22 Jun 2021 05:12:28 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from pdx1-sub0-mail-a46.g.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384) by 100.98.55.86 (trex/6.3.3); Tue, 22 Jun 2021 05:12:29 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Bitter-Quick: 48216f8a68f9fdb0_1624338749258_3499502958 X-MC-Loop-Signature: 1624338749258:3808217085 X-MC-Ingress-Time: 1624338749257 Received: from pdx1-sub0-mail-a46.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a46.g.dreamhost.com (Postfix) with ESMTP id 65D7A880B4; Mon, 21 Jun 2021 22:12:28 -0700 (PDT) Received: from rhbox.intra.reserved-bit.com (unknown [1.186.101.110]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a46.g.dreamhost.com (Postfix) with ESMTPSA id 993D37F50D; Mon, 21 Jun 2021 22:12:25 -0700 (PDT) X-DH-BACKEND: pdx1-sub0-mail-a46 From: Siddhesh Poyarekar To: libc-alpha@sourceware.org Cc: DJ Delorie , Andreas Schwab Subject: [PATCH v2 2/6] gconv_conf: Remove unused variables Date: Tue, 22 Jun 2021 10:41:58 +0530 Message-Id: <20210622051202.4155709-3-siddhesh@sourceware.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210622051202.4155709-1-siddhesh@sourceware.org> References: <20210622051202.4155709-1-siddhesh@sourceware.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-3494.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_NONE, KAM_DMARC_STATUS, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NEUTRAL, 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 05:12:32 -0000 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. Reviewed-by: DJ Delorie Reviewed-by: Andreas Schwab --- 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) =20 /* The actual code to add aliases. */ static void -add_alias2 (const char *from, const char *to, const char *wp, void *modu= les) +add_alias2 (const char *from, const char *to, const char *wp) { /* Test whether this alias conflicts with any available module. */ if (detect_conflict (from)) @@ -161,7 +161,7 @@ add_alias2 (const char *from, const char *to, const c= har *wp, void *modules) =20 /* Add new alias. */ static void -add_alias (char *rp, void *modules) +add_alias (char *rp) { /* We now expect two more string. The strings are normalized (converted to UPPER case) and strored in the alias database. */ @@ -186,7 +186,7 @@ add_alias (char *rp, void *modules) return; *wp++ =3D '\0'; =20 - add_alias2 (from, to, wp, modules); + add_alias2 (from, to, wp); } =20 =20 @@ -250,8 +250,7 @@ insert_module (struct gconv_module *newp, int tobefre= ed) =20 /* Add new module. */ static void -add_module (char *rp, const char *directory, size_t dir_len, void **modu= les, - size_t *nmodules, int modcounter) +add_module (char *rp, const char *directory, size_t dir_len, int modcoun= ter) { /* We expect now 1. `from' name @@ -364,8 +363,7 @@ add_module (char *rp, const char *directory, size_t d= ir_len, void **modules, =20 /* Read the next configuration file. */ static void -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) { /* Note the file is opened with cancellation in the I/O functions disabled. */ @@ -415,10 +413,10 @@ read_conf_file (const char *filename, const char *d= irectory, size_t dir_len, =20 if (rp - word =3D=3D sizeof ("alias") - 1 && memcmp (word, "alias", sizeof ("alias") - 1) =3D=3D 0) - add_alias (rp, *modules); + add_alias (rp); else if (rp - word =3D=3D sizeof ("module") - 1 && memcmp (word, "module", sizeof ("module") - 1) =3D=3D 0) - add_module (rp, directory, dir_len, modules, nmodules, modcounter++); + add_module (rp, directory, dir_len, modcounter++); /* else */ /* Otherwise ignore the line. */ } @@ -540,8 +538,6 @@ __gconv_get_path (void) static void __gconv_read_conf (void) { - void *modules =3D NULL; - size_t nmodules =3D 0; int save_errno =3D errno; size_t cnt; =20 @@ -572,7 +568,7 @@ __gconv_read_conf (void) gconv_conf_filename, sizeof (gconv_conf_filename)); =20 /* Read the gconv-modules configuration file first. */ - read_conf_file (buf, elem, elem_len, &modules, &nmodules); + read_conf_file (buf, elem, elem_len); =20 /* Next, see if there is a gconv-modules.d directory containing configuration files and if it is non-empty. */ @@ -599,7 +595,7 @@ __gconv_read_conf (void) char *conf; if (__asprintf (&conf, "%s/%s", buf, ent->d_name) < 0) continue; - read_conf_file (conf, elem, elem_len, &modules, &nmodules); + read_conf_file (conf, elem, elem_len); free (conf); } } @@ -633,7 +629,7 @@ __gconv_read_conf (void) const char *to =3D __rawmemchr (from, '\0') + 1; cp =3D __rawmemchr (to, '\0') + 1; =20 - add_alias2 (from, to, cp, modules); + add_alias2 (from, to, cp); } while (*cp !=3D '\0'); =20 --=20 2.31.1