iconvconfig: Use the public feof_unlocked

Message ID 20210702094219.3260822-1-siddhesh@sourceware.org
State New
Headers show
Series
  • iconvconfig: Use the public feof_unlocked
Related show

Commit Message

Florian Weimer via Libc-alpha July 2, 2021, 9:42 a.m.
Build of iconvconfig failed with CFLAGS=-Os since __feof_unlocked is
not a public symbol.  Replace with feof_unlocked (defined to
__feof_unlocked when IS_IN (libc)) to fix this.

Reported-by: Szabolcs Nagy <szabolcs.nagy@arm.com>
---
 iconv/gconv_parseconfdir.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

-- 
2.31.1

Comments

Florian Weimer via Libc-alpha July 2, 2021, 10:59 a.m. | #1
The 07/02/2021 15:12, Siddhesh Poyarekar via Libc-alpha wrote:
> Build of iconvconfig failed with CFLAGS=-Os since __feof_unlocked is

> not a public symbol.  Replace with feof_unlocked (defined to

> __feof_unlocked when IS_IN (libc)) to fix this.

> 

> Reported-by: Szabolcs Nagy <szabolcs.nagy@arm.com>


Thanks, this looks right.

Reviewed-by: Szabolcs Nagy <szabolcs.nagy@arm.com>


> ---

>  iconv/gconv_parseconfdir.h | 3 ++-

>  1 file changed, 2 insertions(+), 1 deletion(-)

> 

> diff --git a/iconv/gconv_parseconfdir.h b/iconv/gconv_parseconfdir.h

> index e73ea0ff5c..915b60845c 100644

> --- a/iconv/gconv_parseconfdir.h

> +++ b/iconv/gconv_parseconfdir.h

> @@ -33,6 +33,7 @@

>  # define closedir __closedir

>  # define mempcpy __mempcpy

>  # define lstat64 __lstat64

> +# define feof_unlocked __feof_unlocked

>  #endif

>  

>  /* Name of the file containing the module information in the directories

> @@ -64,7 +65,7 @@ read_conf_file (const char *filename, const char *directory, size_t dir_len)

>  

>    /* Process the known entries of the file.  Comments start with `#' and

>       end with the end of the line.  Empty lines are ignored.  */

> -  while (!__feof_unlocked (fp))

> +  while (!feof_unlocked (fp))

>      {

>        char *rp, *endp, *word;

>        ssize_t n = __getdelim (&line, &line_len, '\n', fp);

> -- 

> 2.31.1

>

Patch

diff --git a/iconv/gconv_parseconfdir.h b/iconv/gconv_parseconfdir.h
index e73ea0ff5c..915b60845c 100644
--- a/iconv/gconv_parseconfdir.h
+++ b/iconv/gconv_parseconfdir.h
@@ -33,6 +33,7 @@ 
 # define closedir __closedir
 # define mempcpy __mempcpy
 # define lstat64 __lstat64
+# define feof_unlocked __feof_unlocked
 #endif
 
 /* Name of the file containing the module information in the directories
@@ -64,7 +65,7 @@  read_conf_file (const char *filename, const char *directory, size_t dir_len)
 
   /* Process the known entries of the file.  Comments start with `#' and
      end with the end of the line.  Empty lines are ignored.  */
-  while (!__feof_unlocked (fp))
+  while (!feof_unlocked (fp))
     {
       char *rp, *endp, *word;
       ssize_t n = __getdelim (&line, &line_len, '\n', fp);