summary refs log tree commit diff
path: root/nss
diff options
context:
space:
mode:
authorStefan Liebler <stli@linux.ibm.com>2020-12-10 11:31:57 +0100
committerStefan Liebler <stli@linux.ibm.com>2020-12-11 09:43:18 +0100
commit6f19927b98de091d83e668b60680be98909834e7 (patch)
tree97e6c0f4b9a1b559bb5a3b481ae1e1a5d735ac69 /nss
parent14ef9c185b79f55f8221a29accd8d3326367102a (diff)
downloadglibc-6f19927b98de091d83e668b60680be98909834e7.tar.gz
glibc-6f19927b98de091d83e668b60680be98909834e7.tar.xz
glibc-6f19927b98de091d83e668b60680be98909834e7.zip
Fix linknamespace errors in nss_database.c if build with -Os.
Starting with recent commits, I get 43 conform/.../linknamespace FAILs:
- nss: Introduce <nss_module.h>
- <nss_action.h>: New abstraction for combining NSS modules and NSS actions
- nss: Implement <nss_database.h> (see nss/nss_database.c)
- nsswitch: use new internal API (core)
- nsswitch: user new internal API (tests)
- nsswitch: use new internal API (callers)

e.g. conform/XPG42/wordexp.h/linknamespace.out
[initial] wordexp -> [libc.a(wordexp.o)] __getpwnam_r -> [libc.a(getpwnam_r.o)] __nss_database_custom -> [libc.a(nsswitch.o)] __nss_database_get -> [libc.a(nss_database.o)] feof_unlocked
[initial] wordexp -> [libc.a(wordexp.o)] __getpwnam_r -> [libc.a(getpwnam_r.o)] __nss_database_custom -> [libc.a(nsswitch.o)] __nss_database_get -> [libc.a(nss_database.o)] ferror_unlocked

This patch is just using __ferror_unlocked and __feof_unlocked instead of the
non "__" prefixed ones.

Reviewed-by: DJ Delorie <dj@redhat.com>
Diffstat (limited to 'nss')
-rw-r--r--nss/nss_database.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/nss/nss_database.c b/nss/nss_database.c
index e8c307d1f3..6ff537152f 100644
--- a/nss/nss_database.c
+++ b/nss/nss_database.c
@@ -271,9 +271,9 @@ nss_database_reload_1 (struct nss_database_data *data, FILE *fp)
   while (true)
     {
       ssize_t ret = __getline (&line, &line_allocated, fp);
-      if (ferror_unlocked (fp))
+      if (__ferror_unlocked (fp))
         break;
-      if (feof_unlocked (fp))
+      if (__feof_unlocked (fp))
         {
           result = true;
           break;