[git commit nptl] do not pass 3rd param to open() which do not create files

[Denys Vlasenko]

commit: http://git.uclibc.org/uClibc/commit/?id=b089e4c6f04697032796286ffb0c3e16138a5da4
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/nptl

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
Signed-off-by: Austin Foxley <austinf at cetoncorp.com>
---
 libc/unistd/daemon.c |   16 ++++------------
 utils/ldd.c          |    2 +-
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/libc/unistd/daemon.c b/libc/unistd/daemon.c
index 88b75f8..e541722 100644
--- a/libc/unistd/daemon.c
+++ b/libc/unistd/daemon.c
@@ -54,14 +54,6 @@
 
 #if defined __USE_BSD || (defined __USE_XOPEN && !defined __USE_UNIX98)
 
-/* libc_hidden_proto(open) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(_exit) */
-/* libc_hidden_proto(dup2) */
-/* libc_hidden_proto(setsid) */
-/* libc_hidden_proto(chdir) */
-/* libc_hidden_proto(fork) */
-
 #ifndef __ARCH_USE_MMU__
 #include <sys/syscall.h>
 #include <sched.h>
@@ -98,7 +90,7 @@ static inline pid_t fork_parent(void)
 }
 #endif
 
-int daemon( int nochdir, int noclose )
+int daemon(int nochdir, int noclose)
 {
 	int fd;
 
@@ -106,7 +98,7 @@ int daemon( int nochdir, int noclose )
 		return -1;
 
 	if (setsid() == -1)
-		return(-1);
+		return -1;
 
 #ifndef __UCLIBC_HAS_THREADS_NATIVE__
 	/* Make certain we are not a session leader, or else we
@@ -119,7 +111,7 @@ int daemon( int nochdir, int noclose )
 		chdir("/");
 
 #ifndef __UCLIBC_HAS_THREADS_NATIVE__
-	if (!noclose && (fd = open(_PATH_DEVNULL, O_RDWR, 0)) != -1)
+	if (!noclose && (fd = open(_PATH_DEVNULL, O_RDWR)) != -1)
 	{
 #else
 	if (!noclose)
@@ -159,6 +151,6 @@ int daemon( int nochdir, int noclose )
 		}
 #endif
 	}
-	return(0);
+	return 0;
 }
 #endif
diff --git a/utils/ldd.c b/utils/ldd.c
index e7a94cb..9cfd984 100644
--- a/utils/ldd.c
+++ b/utils/ldd.c
@@ -262,7 +262,7 @@ static int map_cache(void)
 	else if (cache_addr != NULL)
 		return 0;
 
-	if (stat(LDSO_CACHE, &st) || (fd = open(LDSO_CACHE, O_RDONLY, 0)) < 0) {
+	if (stat(LDSO_CACHE, &st) || (fd = open(LDSO_CACHE, O_RDONLY)) < 0) {
 		fprintf(stderr, "ldd: can't open cache '%s'\n", LDSO_CACHE);
 		cache_addr = (caddr_t) - 1;	/* so we won't try again */
 		return -1;
-- 
1.6.3.3