diff mbox series

Fix linknamespace errors in nss_database.c if build with -Os.

Message ID 20201210103157.3729618-1-stli@linux.ibm.com
State Committed
Commit 6f19927b98de091d83e668b60680be98909834e7
Headers show
Series Fix linknamespace errors in nss_database.c if build with -Os. | expand

Commit Message

Stefan Liebler Dec. 10, 2020, 10:31 a.m. UTC
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.
---
 nss/nss_database.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Stefan Liebler Dec. 10, 2020, 10:37 a.m. UTC | #1
Hi DJ,

Sorry, forgot to CC you. Can you please have a look?

Bye,
Stefan

On 12/10/20 11:31 AM, Stefan Liebler wrote:
> 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.
> ---
>  nss/nss_database.c | 4 ++--
>  1 file 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;
>
diff mbox series

Patch

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;