aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-07-07 18:33:52 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-07-07 18:33:52 +0200
commit7fcdb532534e46f70624fd7e3681eb6831a69303 (patch)
tree60f16913ffc4d1d1464900883d12789e80efedee
parent771473a8c4f44d11e8e6521a96f4e92c20984eb3 (diff)
downloadglibc-7fcdb532534e46f70624fd7e3681eb6831a69303.zip
glibc-7fcdb532534e46f70624fd7e3681eb6831a69303.tar.gz
glibc-7fcdb532534e46f70624fd7e3681eb6831a69303.tar.bz2
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>
-rw-r--r--iconv/gconv_parseconfdir.h2
-rw-r--r--include/stdio.h1
-rw-r--r--libio/iogetdelim.c7
-rw-r--r--libio/libioP.h1
-rw-r--r--stdio-common/getline.c2
-rw-r--r--sysdeps/unix/sysv/linux/readonly-area.c2
6 files changed, 7 insertions, 8 deletions
diff --git a/iconv/gconv_parseconfdir.h b/iconv/gconv_parseconfdir.h
index 915b608..a4153e5 100644
--- 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 311adcf..23b7fd2 100644
--- 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 06450ca..3b1253b 100644
--- 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 4bad7f3..dc9a2ce 100644
--- 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 de21224..52dfc58 100644
--- 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 b42ec6e..fa407d2 100644
--- 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;