aboutsummaryrefslogtreecommitdiff
path: root/nss/nss_db
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-11-16 18:44:53 +0000
committerUlrich Drepper <drepper@redhat.com>1998-11-16 18:44:53 +0000
commit9d1efe331c8437e22b4a8110f435d92c7d38774b (patch)
tree612b40fe9ad8ea952e7497216caeb837b656c107 /nss/nss_db
parent8b7fb5883bf50ab866f785b9cb36c8167f7a3286 (diff)
downloadglibc-9d1efe331c8437e22b4a8110f435d92c7d38774b.zip
glibc-9d1efe331c8437e22b4a8110f435d92c7d38774b.tar.gz
glibc-9d1efe331c8437e22b4a8110f435d92c7d38774b.tar.bz2
Update.
* intl/locale.alias: Change `japanese' alais to match X11R6's. Add `japanese.euc' alias. * manual/Makefile (%.info): Set LANGUAGE and LC_ALL explicitly to C before running makeinfo. * math/Makefile (libm-routines): $(strip) entire value. * nss/nss_db/db-XXX.c (internal_setent): Rewrite to avoid warning. 1998-10-24 H.J. Lu <hjl@gnu.org> * libio/libio.h (_IO_cookie_io_functions_t): Protect with __USE_GNU. (_IO_cookie_file): Likewise. 1998-11-16 Philip Blundell <philb@gnu.org> * inet/netinet/icmp6.h: Correct naming of constants. 1998-11-16 Ulrich Drepper <drepper@cygnus.com> (fwrite_unlocked): Likewise. format, just stop.
Diffstat (limited to 'nss/nss_db')
-rw-r--r--nss/nss_db/db-XXX.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/nss/nss_db/db-XXX.c b/nss/nss_db/db-XXX.c
index 8ba73ef..7356b34 100644
--- a/nss/nss_db/db-XXX.c
+++ b/nss/nss_db/db-XXX.c
@@ -73,9 +73,9 @@ internal_setent (int stayopen)
}
else
{
- /* We have to make sure the file is `closed on exec'. */
+ /* We have to make sure the file is `closed on exec'. */
int fd;
- int result, flags;
+ int result;
err = db->fd (db, &fd);
if (err != 0)
@@ -84,11 +84,14 @@ internal_setent (int stayopen)
result = -1;
}
else
- result = flags = fcntl (fd, F_GETFD, 0);
- if (result >= 0)
{
- flags |= FD_CLOEXEC;
- result = fcntl (fd, F_SETFD, flags);
+ int flags = result = fcntl (fd, F_GETFD, 0);
+
+ if (result >= 0)
+ {
+ flags |= FD_CLOEXEC;
+ result = fcntl (fd, F_SETFD, flags);
+ }
}
if (result < 0)
{