svn commit: trunk/uClibc/libc/sysdeps/linux/common

andersen at uclibc.org andersen at uclibc.org
Wed Aug 30 17:12:52 UTC 2006


Author: andersen
Date: 2006-08-30 10:12:51 -0700 (Wed, 30 Aug 2006)
New Revision: 16019

Log:
tweak a few syscalls using varargs


Modified:
   trunk/uClibc/libc/sysdeps/linux/common/__syscall_fcntl64.c
   trunk/uClibc/libc/sysdeps/linux/common/ioctl.c
   trunk/uClibc/libc/sysdeps/linux/common/open.c
   trunk/uClibc/libc/sysdeps/linux/common/open64.c
   trunk/uClibc/libc/sysdeps/linux/common/ptrace.c


Changeset:
Modified: trunk/uClibc/libc/sysdeps/linux/common/__syscall_fcntl64.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/__syscall_fcntl64.c	2006-08-30 16:50:00 UTC (rev 16018)
+++ trunk/uClibc/libc/sysdeps/linux/common/__syscall_fcntl64.c	2006-08-30 17:12:51 UTC (rev 16019)
@@ -24,8 +24,8 @@
 
 	va_start(list, cmd);
 	arg = va_arg(list, long);
+	va_end(list);
 
-	va_end(list);
 	return (__syscall_fcntl64(fd, cmd, arg));
 }
 libc_hidden_def(__libc_fcntl64)

Modified: trunk/uClibc/libc/sysdeps/linux/common/ioctl.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/ioctl.c	2006-08-30 16:50:00 UTC (rev 16018)
+++ trunk/uClibc/libc/sysdeps/linux/common/ioctl.c	2006-08-30 17:12:51 UTC (rev 16019)
@@ -24,8 +24,8 @@
 
     va_start(list, request);
     arg = va_arg(list, void *);
+    va_end(list);
 
-    va_end(list);
     return __syscall_ioctl(fd, request, arg);
 }
 libc_hidden_def(ioctl)

Modified: trunk/uClibc/libc/sysdeps/linux/common/open.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/open.c	2006-08-30 16:50:00 UTC (rev 16018)
+++ trunk/uClibc/libc/sysdeps/linux/common/open.c	2006-08-30 17:12:51 UTC (rev 16019)
@@ -22,19 +22,18 @@
 		int, flags, __kernel_mode_t, mode);
 
 libc_hidden_proto(__libc_open)
-int __libc_open(const char *file, int flags, ...)
+int __libc_open(const char *file, int oflag, ...)
 {
-	/* gcc may warn about mode being uninitialized.
-	 * Just ignore that, since gcc is wrong. */
-	mode_t mode;
+	mode_t mode = 0;
 
-	if (flags & O_CREAT) {
-		va_list ap;
-
-		va_start(ap, flags);
-		mode = va_arg(ap, mode_t);
-		va_end(ap);
+	if (oflag & O_CREAT)
+	{
+		va_list arg;
+		va_start (arg, oflag);
+		mode = va_arg (arg, mode_t);
+		va_end (arg);
 	}
+
 	return __syscall_open(file, flags, mode);
 }
 libc_hidden_def(__libc_open)

Modified: trunk/uClibc/libc/sysdeps/linux/common/open64.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/open64.c	2006-08-30 16:50:00 UTC (rev 16018)
+++ trunk/uClibc/libc/sysdeps/linux/common/open64.c	2006-08-30 17:12:51 UTC (rev 16019)
@@ -23,17 +23,17 @@
 libc_hidden_proto(__libc_open64)
 int __libc_open64 (const char *file, int oflag, ...)
 {
-  int mode = 0;
+    mode_t mode = 0;
 
-  if (oflag & O_CREAT)
+    if (oflag & O_CREAT)
     {
-      va_list arg;
-      va_start (arg, oflag);
-      mode = va_arg (arg, int);
-      va_end (arg);
+	va_list arg;
+	va_start (arg, oflag);
+	mode = va_arg (arg, mode_t);
+	va_end (arg);
     }
 
-  return __libc_open(file, oflag | O_LARGEFILE, mode);
+    return __libc_open(file, oflag | O_LARGEFILE, mode);
 }
 libc_hidden_def(__libc_open64)
 

Modified: trunk/uClibc/libc/sysdeps/linux/common/ptrace.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/ptrace.c	2006-08-30 16:50:00 UTC (rev 16018)
+++ trunk/uClibc/libc/sysdeps/linux/common/ptrace.c	2006-08-30 17:12:51 UTC (rev 16019)
@@ -12,7 +12,7 @@
 
 #define __NR___syscall_ptrace __NR_ptrace
 
-static inline _syscall4(long, __syscall_ptrace, enum __ptrace_request, request, 
+static inline _syscall4(long, __syscall_ptrace, enum __ptrace_request, request,
 		__kernel_pid_t, pid, void*, addr, void*, data);
 
 long int




More information about the uClibc-cvs mailing list