summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--io/openat.c8
-rw-r--r--io/openat64.c8
-rw-r--r--misc/ptrace.c44
-rw-r--r--misc/reboot.c7
5 files changed, 48 insertions, 29 deletions
diff --git a/ChangeLog b/ChangeLog
index 5134d116c8..f3dc8421fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2014-12-04  Roland McGrath  <roland@hack.frob.com>
+
+	* io/openat64.c: #include <libc-internal.h>
+	(__openat64): Prototypify.  Use ignore_value on MODE.
+	* io/openat.c: Likewise.
+	* misc/reboot.c: #include <libc-internal.h>
+	(reboot): Prototypify.  Use ignore_value on HOWTO.
+	* misc/ptrace.c: #include <libc-internal.h>
+	(ptrace): Prototypify.  Use ignore_value for va_arg'd parameters.
+
 2014-12-04  Joseph Myers  <joseph@codesourcery.com>
 
 	* conform/list-header-symbols.pl (%extra_syms): Add h_errno for
diff --git a/io/openat.c b/io/openat.c
index 2d822702af..18fe750c31 100644
--- a/io/openat.c
+++ b/io/openat.c
@@ -22,6 +22,7 @@
 #include <stdio.h>
 #include <sys/stat.h>
 #include <kernel-features.h>
+#include <libc-internal.h>
 
 /* Some mostly-generic code (e.g. sysdeps/posix/getcwd.c) uses this variable
    if __ASSUME_ATFCTS is not defined.  */
@@ -33,10 +34,7 @@ int __have_atfcts;
    the directory associated with FD.  If OFLAG includes O_CREAT, a
    third argument is the file protection.  */
 int
-__openat (fd, file, oflag)
-     int fd;
-     const char *file;
-     int oflag;
+__openat (int fd, const char *file, int oflag, ...)
 {
   int mode;
 
@@ -66,6 +64,8 @@ __openat (fd, file, oflag)
       va_start (arg, oflag);
       mode = va_arg (arg, int);
       va_end (arg);
+
+      ignore_value (mode);
     }
 
   __set_errno (ENOSYS);
diff --git a/io/openat64.c b/io/openat64.c
index c0c4e19589..c4d60677d1 100644
--- a/io/openat64.c
+++ b/io/openat64.c
@@ -21,15 +21,13 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <sys/stat.h>
+#include <libc-internal.h>
 
 /* Open FILE with access OFLAG.  Interpret relative paths relative to
    the directory associated with FD.  If OFLAG includes O_CREAT, a
    third argument is the file protection.  */
 int
-__openat64 (fd, file, oflag)
-     int fd;
-     const char *file;
-     int oflag;
+__openat64 (int fd, const char *file, int oflag, ...)
 {
   int mode;
 
@@ -59,6 +57,8 @@ __openat64 (fd, file, oflag)
       va_start (arg, oflag);
       mode = va_arg (arg, int);
       va_end (arg);
+
+      ignore_value (mode);
     }
 
   __set_errno (ENOSYS);
diff --git a/misc/ptrace.c b/misc/ptrace.c
index f999e73b4f..b6db0153d2 100644
--- a/misc/ptrace.c
+++ b/misc/ptrace.c
@@ -19,6 +19,7 @@
 #include <sys/ptrace.h>
 #include <sys/types.h>
 #include <stdarg.h>
+#include <libc-internal.h>
 
 /* Perform process tracing functions.  REQUEST is one of the values
    in <sys/ptrace.h>, and determines the action to be taken.
@@ -30,8 +31,7 @@
      pid_t PID, void *ADDR, int DATA, void *ADDR2
    after PID.  */
 int
-ptrace (request)
-     enum __ptrace_request request;
+ptrace (enum __ptrace_request request, ...)
 {
   pid_t pid;
   void *addr;
@@ -60,32 +60,41 @@ ptrace (request)
     case PTRACE_SETFPREGS:
     case PTRACE_GETFPAREGS:
     case PTRACE_SETFPAREGS:
-      va_start(ap, request);
-      pid = va_arg(ap, pid_t);
-      addr = va_arg(ap, void *);
-      va_end(ap);
+      va_start (ap, request);
+      pid = va_arg (ap, pid_t);
+      addr = va_arg (ap, void *);
+      va_end (ap);
+      ignore_value (pid);
+      ignore_value (addr);
       break;
 
     case PTRACE_POKETEXT:
     case PTRACE_POKEDATA:
     case PTRACE_POKEUSER:
-      va_start(ap, request);
-      pid = va_arg(ap, pid_t);
-      addr = va_arg(ap, void *);
-      data = va_arg(ap, int);
-      va_end(ap);
+      va_start (ap, request);
+      pid = va_arg (ap, pid_t);
+      addr = va_arg (ap, void *);
+      data = va_arg (ap, int);
+      va_end (ap);
+      ignore_value (pid);
+      ignore_value (addr);
+      ignore_value (data);
       break;
 
     case PTRACE_READDATA:
     case PTRACE_WRITEDATA:
     case PTRACE_READTEXT:
     case PTRACE_WRITETEXT:
-      va_start(ap, request);
-      pid = va_arg(ap, pid_t);
-      addr = va_arg(ap, void *);
-      data = va_arg(ap, int);
-      addr2 = va_arg(ap, void *);
-      va_end(ap);
+      va_start (ap, request);
+      pid = va_arg (ap, pid_t);
+      addr = va_arg (ap, void *);
+      data = va_arg (ap, int);
+      addr2 = va_arg (ap, void *);
+      va_end (ap);
+      ignore_value (pid);
+      ignore_value (addr);
+      ignore_value (data);
+      ignore_value (addr2);
       break;
 
     default:
@@ -97,5 +106,4 @@ ptrace (request)
   return -1;
 }
 
-
 stub_warning (ptrace)
diff --git a/misc/reboot.c b/misc/reboot.c
index 3b3c21f616..d0c28c966e 100644
--- a/misc/reboot.c
+++ b/misc/reboot.c
@@ -18,15 +18,16 @@
 #include <errno.h>
 #include <unistd.h>
 #include <sys/reboot.h>
+#include <libc-internal.h>
 
 /* Reboot the system.  */
 int
-reboot (howto)
-     int howto;
+reboot (int howto)
 {
+  ignore_value (howto);
+
   __set_errno (ENOSYS);
   return -1;
 }
 
-
 stub_warning (reboot)