Re: [PATCH 2/6] gconv_conf: Remove unused variables

[DJ Delorie <dj@redhat.com>]

Siddhesh Poyarekar <siddhesh@sourceware.org> 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 <dj@redhat.com>