summaryrefslogtreecommitdiff
path: root/nscd/initgrcache.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-07-01 23:02:09 -0400
committerUlrich Drepper <drepper@gmail.com>2011-07-01 23:02:09 -0400
commit99231d9abe0fd74c7957d25b08c1d1ede4cae5a0 (patch)
tree6dc0e8933810858078f847cd60b9c592f6660e6c /nscd/initgrcache.c
parent445b4a53ea9d6c457c5f4ac1538102d8be0a5d89 (diff)
nscd cleanups
Cleanup and optimize last patch. Add timeout fixes also to the services cache.
Diffstat (limited to 'nscd/initgrcache.c')
-rw-r--r--nscd/initgrcache.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/nscd/initgrcache.c b/nscd/initgrcache.c
index 7fd564d0bc..4ac9942aeb 100644
--- a/nscd/initgrcache.c
+++ b/nscd/initgrcache.c
@@ -1,5 +1,5 @@
/* Cache handling for host lookup.
- Copyright (C) 2004, 2005, 2006, 2008, 2009, 2011 Free Software Foundation, Inc.
+ Copyright (C) 2004-2006, 2008, 2009, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
@@ -203,13 +203,14 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req,
MSG_NOSIGNAL));
/* If we cannot permanently store the result, so be it. */
- if (db->negtimeout == 0)
+ if (__builtin_expect (db->negtimeout == 0, 0))
{
/* Mark the old entry as obsolete. */
if (dh != NULL)
dh->usable = false;
}
- else if ((dataset = mempool_alloc (db, sizeof (struct dataset) + req->key_len, 1)) != NULL)
+ else if ((dataset = mempool_alloc (db, (sizeof (struct dataset)
+ + req->key_len), 1)) != NULL)
{
dataset->head.allocsize = sizeof (struct dataset) + req->key_len;
dataset->head.recsize = total;