public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] Rename procutils_read_file to __libc_procutils_read_file [BZ #31755]
@ 2024-05-20 12:22 H.J. Lu
0 siblings, 0 replies; only message in thread
From: H.J. Lu @ 2024-05-20 12:22 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=7935e7a537cd3347b922dc9f24a2b722dd80156c
commit 7935e7a537cd3347b922dc9f24a2b722dd80156c
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Sun May 19 18:46:36 2024 -0700
Rename procutils_read_file to __libc_procutils_read_file [BZ #31755]
Fix BZ #31755 by renaming the internal function procutils_read_file to
__libc_procutils_read_file.
Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diff:
---
sysdeps/unix/sysv/linux/pidfd_getpid.c | 2 +-
sysdeps/unix/sysv/linux/procutils.c | 5 +++--
sysdeps/unix/sysv/linux/procutils.h | 5 +++--
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/sysdeps/unix/sysv/linux/pidfd_getpid.c b/sysdeps/unix/sysv/linux/pidfd_getpid.c
index 8567b413dd..ebcbe8fdf6 100644
--- a/sysdeps/unix/sysv/linux/pidfd_getpid.c
+++ b/sysdeps/unix/sysv/linux/pidfd_getpid.c
@@ -105,7 +105,7 @@ pidfd_getpid (int fd)
*_fitoa_word (fd, p, 10, 0) = '\0';
struct parse_fdinfo_t fdinfo = { .found = false, .pid = -1 };
- if (!procutils_read_file (fdinfoname, parse_fdinfo, &fdinfo))
+ if (!__libc_procutils_read_file (fdinfoname, parse_fdinfo, &fdinfo))
/* The fdinfo contains an invalid 'Pid:' value. */
return INLINE_SYSCALL_ERROR_RETURN_VALUE (EBADF);
diff --git a/sysdeps/unix/sysv/linux/procutils.c b/sysdeps/unix/sysv/linux/procutils.c
index 25666ec0cb..86d3d37329 100644
--- a/sysdeps/unix/sysv/linux/procutils.c
+++ b/sysdeps/unix/sysv/linux/procutils.c
@@ -71,8 +71,9 @@ next_line (char **r, int fd, char *const buffer, char **cp, char **re,
}
bool
-procutils_read_file (const char *filename, procutils_closure_t closure,
- void *arg)
+__libc_procutils_read_file (const char *filename,
+ procutils_closure_t closure,
+ void *arg)
{
enum { buffer_size = PROCUTILS_MAX_LINE_LEN };
char buffer[buffer_size];
diff --git a/sysdeps/unix/sysv/linux/procutils.h b/sysdeps/unix/sysv/linux/procutils.h
index 73ef3e5f5b..acf1ec587a 100644
--- a/sysdeps/unix/sysv/linux/procutils.h
+++ b/sysdeps/unix/sysv/linux/procutils.h
@@ -37,7 +37,8 @@ typedef int (*procutils_closure_t) (const char *line, void *arg);
It returns true in case the file is fully read or false if CLOSURE
returns a value diferent than 0. */
-bool procutils_read_file (const char *filename, procutils_closure_t closure,
- void *arg) attribute_hidden;
+bool __libc_procutils_read_file (const char *filename,
+ procutils_closure_t closure,
+ void *arg) attribute_hidden;
#endif
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-05-20 12:22 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-05-20 12:22 [glibc] Rename procutils_read_file to __libc_procutils_read_file [BZ #31755] H.J. Lu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).