From: Ulrich Drepper Date: Mon, 4 Nov 2002 10:20:14 +0000 (+0000) Subject: Update. X-Git-Tag: upstream/2.20~13805 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=226e9fda254a6c4f63837d4cfa5366c1d87d77f9;p=platform%2Fupstream%2Flinaro-glibc.git Update. * nss/getXXent_r.c (ENDFUNC_NAME): Don't do anything if the service hasn't been used [PR libc/4744]. --- diff --git a/ChangeLog b/ChangeLog index bd37eaf..a9fa94f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2002-11-04 Ulrich Drepper + * nss/getXXent_r.c (ENDFUNC_NAME): Don't do anything if the + service hasn't been used [PR libc/4744]. + * include/features.h: Use __STDC_VERSION__ not __STDC_VERSION. Reported by Miloslav Trmac [PR libc/4766]. diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 8569a37..414e309 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,5 +1,8 @@ 2002-11-04 Ulrich Drepper + * sysdeps/i386/Makefile: Compile pthread.c and sighandler.c with + -fno-omit-frame-pointer. Patch by Andreas Steinmetz . + * sysdeps/i386/useldt.h [PIC] (USETLS_LOAD_EBX): Use correct input register number. (DO_SET_THREAD_AREA): Mark asm output specifiers correctly. diff --git a/nss/getXXent_r.c b/nss/getXXent_r.c index 1d203db..5a1e3e9 100644 --- a/nss/getXXent_r.c +++ b/nss/getXXent_r.c @@ -137,12 +137,16 @@ ENDFUNC_NAME (void) { int save; - __libc_lock_lock (lock); - __nss_endent (ENDFUNC_NAME_STRING, DB_LOOKUP_FCT, &nip, &startp, - &last_nip, NEED__RES); - save = errno; - __libc_lock_unlock (lock); - __set_errno (save); + /* If the service has not been used before do not do anything. */ + if (startp != NULL) + { + __libc_lock_lock (lock); + __nss_endent (ENDFUNC_NAME_STRING, DB_LOOKUP_FCT, &nip, &startp, + &last_nip, NEED__RES); + save = errno; + __libc_lock_unlock (lock); + __set_errno (save); + } }