From b57018905f25910ac0a4af81e3ea61629a1783e9 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 25 Jan 1999 11:00:16 +0000 Subject: [PATCH] Update. 1999-01-26 Geoff Keating * nss/nss_db/db-netgrp.c (_nss_db_setnetgrent): Suppress warning about potentially uninitialized `flags'. * nss/nss_db/db-alias.c (internal_setent): Likewise. 1999-01-25 Andreas Jaeger * elf/failobj.c: Provide prototype for xyzzy. 1999-01-25 Philip Blundell * sysdeps/unix/sysv/linux/arm/clone.S: Correct error check again. --- ChangeLog | 14 ++++++++++++++ elf/failobj.c | 2 ++ nss/nss_db/db-alias.c | 13 +++++++------ nss/nss_db/db-netgrp.c | 13 +++++++------ sysdeps/unix/sysv/linux/Dist | 1 - 5 files changed, 30 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0ec2a62..948c052 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +1999-01-26 Geoff Keating + + * nss/nss_db/db-netgrp.c (_nss_db_setnetgrent): Suppress warning + about potentially uninitialized `flags'. + * nss/nss_db/db-alias.c (internal_setent): Likewise. + +1999-01-25 Andreas Jaeger + + * elf/failobj.c: Provide prototype for xyzzy. + +1999-01-25 Philip Blundell + + * sysdeps/unix/sysv/linux/arm/clone.S: Correct error check again. + 1999-01-24 Roland McGrath * sysdeps/mach/hurd/ioctl.c: Include . diff --git a/elf/failobj.c b/elf/failobj.c index 16228c7..e938d4a 100644 --- a/elf/failobj.c +++ b/elf/failobj.c @@ -1,4 +1,6 @@ /* This function is supposed to not exist. */ +extern int xyzzy (int); + int foo (int a) { diff --git a/nss/nss_db/db-alias.c b/nss/nss_db/db-alias.c index 81037ed..bc9eea8 100644 --- a/nss/nss_db/db-alias.c +++ b/nss/nss_db/db-alias.c @@ -1,5 +1,5 @@ /* Mail alias file parser in nss_db module. - Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1996. @@ -60,7 +60,7 @@ internal_setent (int stayopen) { /* 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) @@ -69,12 +69,13 @@ 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); + result = fcntl (fd, F_GETFD, 0); + + if (result >= 0) + result = fcntl (fd, F_SETFD, result | FD_CLOEXEC); } + if (result < 0) { /* Something went wrong. Close the stream and return a diff --git a/nss/nss_db/db-netgrp.c b/nss/nss_db/db-netgrp.c index 8707d85..722281d 100644 --- a/nss/nss_db/db-netgrp.c +++ b/nss/nss_db/db-netgrp.c @@ -1,5 +1,5 @@ /* Netgroup file parser in nss_db modules. - Copyright (C) 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1996. @@ -61,7 +61,7 @@ _nss_db_setnetgrent (const char *group) { /* 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) @@ -70,12 +70,13 @@ _nss_db_setnetgrent (const char *group) result = -1; } else - result = flags = fcntl (fd, F_GETFD, 0); - if (result >= 0) { - flags |= FD_CLOEXEC; - result = fcntl (fd, F_SETFD, flags); + result = fcntl (fd, F_GETFD, 0); + + if (result >= 0) + result = fcntl (fd, F_SETFD, result | FD_CLOEXEC); } + if (result < 0) { /* Something went wrong. Close the stream and return a diff --git a/sysdeps/unix/sysv/linux/Dist b/sysdeps/unix/sysv/linux/Dist index a9408bf..6039e9a 100644 --- a/sysdeps/unix/sysv/linux/Dist +++ b/sysdeps/unix/sysv/linux/Dist @@ -66,7 +66,6 @@ sys/socketvar.h sys/soundcard.h sys/sysctl.h sys/sysinfo.h -sys/sysmacros.h sys/timex.h sys/ultrasound.h sys/user.h -- 2.7.4