libio: Replace internal _IO_getdelim symbol with __getdelim

__getdelim is exported, _IO_getdelim is not.  Add a hidden prototype
for __getdelim.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

diff --git a/iconv/gconv_parseconfdir.h b/iconv/gconv_parseconfdir.h
index 915b60845ca11c03363e67f967d411191473f5a3..a4153e54c6d437973a952b21c5c81f931c93b0fb 100644 (file)
--- a/iconv/gconv_parseconfdir.h
+++ b/iconv/gconv_parseconfdir.h
@@ -23,7 +23,7 @@
 
 #if IS_IN (libc)
 # include <libio/libioP.h>
-# define __getdelim(line, len, c, fp) _IO_getdelim (line, len, c, fp)
+# define __getdelim(line, len, c, fp) __getdelim (line, len, c, fp)
 
 # undef isspace
 # define isspace(__c) __isspace_l ((__c), _nl_C_locobj_ptr)

diff --git a/include/stdio.h b/include/stdio.h
index 311adcf95390bc6083fea25a5ef739375150a091..23b7fd288cdaba66b1740efa8e03b08cd8469b9d 100644 (file)
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -213,6 +213,7 @@ libc_hidden_ldbl_proto (fprintf)
 libc_hidden_ldbl_proto (vfprintf)
 libc_hidden_ldbl_proto (sprintf)
 libc_hidden_proto (ungetc)
+libc_hidden_proto (__getdelim)
 libc_hidden_proto (fwrite)
 libc_hidden_proto (perror)
 libc_hidden_proto (remove)

diff --git a/libio/iogetdelim.c b/libio/iogetdelim.c
index 06450ca96c0f675ebf468278d026f044fa9dfcc3..3b1253bae879ac6c23c6d1b28f80101de7c7294b 100644 (file)
--- a/libio/iogetdelim.c
+++ b/libio/iogetdelim.c
@@ -37,7 +37,7 @@
    null terminator), or -1 on error or EOF.  */
 
 ssize_t
-_IO_getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp)
+__getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp)
 {
   ssize_t result;
   ssize_t cur_len = 0;
@@ -122,6 +122,5 @@ unlock_return:
   _IO_release_lock (fp);
   return result;
 }
-
-weak_alias (_IO_getdelim, __getdelim)
-weak_alias (_IO_getdelim, getdelim)
+libc_hidden_def (__getdelim)
+weak_alias (__getdelim, getdelim)

diff --git a/libio/libioP.h b/libio/libioP.h
index 4bad7f3c062c5ed6f9c778da4e10eb4836ce3406..dc9a2ce9c8d7744c1a857a2d69173d66ca484a30 100644 (file)
--- a/libio/libioP.h
+++ b/libio/libioP.h
@@ -734,7 +734,6 @@ libc_hidden_proto (_IO_getline)
 extern size_t _IO_getline_info (FILE *,char *, size_t,
                                    int, int, int *);
 libc_hidden_proto (_IO_getline_info)
-extern ssize_t _IO_getdelim (char **, size_t *, int, FILE *);
 extern size_t _IO_getwline (FILE *,wchar_t *, size_t, wint_t, int);
 extern size_t _IO_getwline_info (FILE *,wchar_t *, size_t,
                                     wint_t, int, wint_t *);

diff --git a/stdio-common/getline.c b/stdio-common/getline.c
index de212243bba03ef59c0c1e5b2710e82ba10d3a56..52dfc58f2b159bf065dcba9f355dd6c1798b1389 100644 (file)
--- a/stdio-common/getline.c
+++ b/stdio-common/getline.c
@@ -25,7 +25,7 @@
 ssize_t
 __getline (char **lineptr, size_t *n, FILE *stream)
 {
-  return _IO_getdelim (lineptr, n, '\n', stream);
+  return __getdelim (lineptr, n, '\n', stream);
 }
 
 weak_alias (__getline, getline)

diff --git a/sysdeps/unix/sysv/linux/readonly-area.c b/sysdeps/unix/sysv/linux/readonly-area.c
index b42ec6ef3e034c14eb8184780e92fbecfb6dbf0e..fa407d2f05e6b9aaec4e9a4f098498e8b8818828 100644 (file)
--- a/sysdeps/unix/sysv/linux/readonly-area.c
+++ b/sysdeps/unix/sysv/linux/readonly-area.c
@@ -55,7 +55,7 @@ __readonly_area (const char *ptr, size_t size)
 
   while (! __feof_unlocked (fp))
     {
-      if (_IO_getdelim (&line, &linelen, '\n', fp) <= 0)
+      if (__getdelim (&line, &linelen, '\n', fp) <= 0)
        break;
 
       char *p;