summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-09-29 05:59:26 +0000
committerUlrich Drepper <drepper@redhat.com>2004-09-29 05:59:26 +0000
commit81177191975d35ca66ff9516ec845e6b3e53fa2f (patch)
tree2163bb28fea3c1e86a19c36ea1370c49b1d7370c
parent4f21c95d3a51a81fdbda3de46ce38e729f3c7b0b (diff)
* nscd/nscd_getai.c: Use NO_MAPPING instead of MAP_FAILED for test of failing __nscd_get_map_ref. Fix a few typos.
-rw-r--r--ChangeLog3
-rw-r--r--nscd/nscd_getai.c6
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e0e6f916e8..68c6472eac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2004-09-28 Ulrich Drepper <drepper@redhat.com>
+ * nscd/nscd_getai.c: Use NO_MAPPING instead of MAP_FAILED for test
+ of failing __nscd_get_map_ref. Fix a few typos.
+
* sysdeps/unix/sysv/linux/sigwait.c (do_sigwait): Make sure
SIGSETXID is not blocked.
* sysdeps/unix/sysv/linux/sigwaitinfo.c (do_sigwaitinfo): Likewise.
diff --git a/nscd/nscd_getai.c b/nscd/nscd_getai.c
index 627fe8cf9d..a9eac48ac8 100644
--- a/nscd/nscd_getai.c
+++ b/nscd/nscd_getai.c
@@ -38,7 +38,7 @@ libc_locked_map_ptr (map_handle);
/* Note that we only free the structure if necessary. The memory
mapping is not removed since it is not visible to the malloc
handling. */
-libc_freeres_fn (gr_map_free)
+libc_freeres_fn (ai_map_free)
{
if (map_handle.mapped != NO_MAPPING)
@@ -63,7 +63,7 @@ __nscd_getai (const char *key, struct nscd_ai_result **result, int *h_errnop)
struct mapped_database *mapped = __nscd_get_map_ref (GETFDHST, "hosts",
&map_handle, &gc_cycle);
retry:
- if (mapped != MAP_FAILED)
+ if (mapped != NO_MAPPING)
{
const struct datahead *found = __nscd_cache_search (GETAI, key, keylen,
mapped);
@@ -86,7 +86,7 @@ __nscd_getai (const char *key, struct nscd_ai_result **result, int *h_errnop)
{
/* nscd not running or wrong version or hosts caching disabled. */
__nss_not_use_nscd_hosts = 1;
- goto out;;
+ goto out;
}
ai_resp = &ai_resp_mem;