[git commit] use open_not_cancel_2 instead of open_not_cancel

Bernhard Reutner-Fischer rep.dot.nop at gmail.com
Fri Jun 15 12:00:42 UTC 2012


commit: http://git.uclibc.org/uClibc/commit/?id=425803868468b8ca52c7aa7fb8fb8b81d866dc7f
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master

Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
 libc/misc/utmp/wtent.c |    2 +-
 libc/unistd/daemon.c   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libc/misc/utmp/wtent.c b/libc/misc/utmp/wtent.c
index 9725426..9b3ad50 100644
--- a/libc/misc/utmp/wtent.c
+++ b/libc/misc/utmp/wtent.c
@@ -40,7 +40,7 @@ static void __updwtmp(const char *wtmp_file, const struct utmp *lutmp)
 {
     int fd;
 
-    fd = open_not_cancel(wtmp_file, O_APPEND | O_WRONLY, 0);
+    fd = open_not_cancel_2(wtmp_file, O_APPEND | O_WRONLY);
     if (fd >= 0) {
 	if (lockf(fd, F_LOCK, 0) == 0) {
 	    write_not_cancel(fd, lutmp, sizeof(struct utmp));
diff --git a/libc/unistd/daemon.c b/libc/unistd/daemon.c
index 628df51..435d4f1 100644
--- a/libc/unistd/daemon.c
+++ b/libc/unistd/daemon.c
@@ -118,7 +118,7 @@ int daemon(int nochdir, int noclose)
 	{
 		struct STAT st;
 
-		if ((fd = open_not_cancel(_PATH_DEVNULL, O_RDWR, 0)) != -1
+		if ((fd = open_not_cancel_2(_PATH_DEVNULL, O_RDWR)) != -1
 			&& (__builtin_expect (FSTAT (fd, &st), 0) == 0))
 		{
 			if (__builtin_expect (S_ISCHR (st.st_mode), 1) != 0) {


More information about the uClibc-cvs mailing list