diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-08-20 15:25:16 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-08-20 15:25:16 -0400 |
| commit | 89f447edba330554fb50b19009938c8c19cc7414 (patch) | |
| tree | cae1954a1c1b608eac02d0e6bc1e97faed261b70 | |
| parent | 5dc4290c5b587c9b1fa960588a83c8d6a63ce43b (diff) | |
| download | glibc-89f447edba330554fb50b19009938c8c19cc7414.tar.gz glibc-89f447edba330554fb50b19009938c8c19cc7414.tar.xz glibc-89f447edba330554fb50b19009938c8c19cc7414.zip | |
Minor optimizatin in alias lookup in files NSS module
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | nss/nss_files/files-alias.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index ca38ec3234..5af9c0b190 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2011-08-20 Ulrich Drepper <drepper@gmail.com> + * nss/nss_files/files-alias.c (get_next_alias): Use feof_unlocked. + * elf/dl-open.c (add_to_global): Report additions to the global scope for LD_DEBUG=scopes. (dl_open_worker): Also print scope of newly loaded dependencies. diff --git a/nss/nss_files/files-alias.c b/nss/nss_files/files-alias.c index 57cc982f77..0a722b9e25 100644 --- a/nss/nss_files/files-alias.c +++ b/nss/nss_files/files-alias.c @@ -1,5 +1,5 @@ /* Mail alias file parser in nss_files module. - Copyright (C) 1996,97,98,99,2002,2006,2007 Free Software Foundation, Inc. + Copyright (C) 1996-1999,2002,2006,2007,2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -166,7 +166,7 @@ get_next_alias (const char *match, struct aliasent *result, char *line; /* Check whether the buffer is large enough for even trying to - read something. */ + read something. */ if (room_left < 2) goto no_more_room; @@ -264,7 +264,7 @@ get_next_alias (const char *match, struct aliasent *result, if (listfile != NULL && (old_line = strdup (line)) != NULL) { - while (! feof (listfile)) + while (! feof_unlocked (listfile)) { first_unused[room_left - 1] = '\xff'; line = fgets_unlocked (first_unused, room_left, |