Avoid "format not a string literal" warnings

[deliverable/binutils-gdb.git] / gdb / proc-events.c

diff --git a/gdb/proc-events.c b/gdb/proc-events.c
index 4b466a3336b9675288e0137eaebab83b73c65f1d..b291d317fe454b85d4486e4f7c8d542a72f9216b 100644 (file)
--- a/gdb/proc-events.c
+++ b/gdb/proc-events.c
@@ -1,6 +1,6 @@
 /* Machine-independent support for SVR4 /proc (process file system)
 
 /* Machine-independent support for SVR4 /proc (process file system)
 

-   Copyright (C) 1999-2013 Free Software Foundation, Inc.
+   Copyright (C) 1999-2016 Free Software Foundation, Inc.

 
    Written by Michael Snyder at Cygnus Solutions.
    Based on work by Fred Fish, Stu Grossman, Geoff Noer, and others.
 
    Written by Michael Snyder at Cygnus Solutions.
    Based on work by Fred Fish, Stu Grossman, Geoff Noer, and others.


@@ -34,7 +34,6 @@
 #define _STRUCTURED_PROC 1
 #endif
 
 #define _STRUCTURED_PROC 1
 #endif
 

-#include <stdio.h>

 #include <sys/types.h>
 #include <sys/procfs.h>
 #ifdef HAVE_SYS_SYSCALL_H
 #include <sys/types.h>
 #include <sys/procfs.h>
 #ifdef HAVE_SYS_SYSCALL_H


@@ -1396,47 +1395,47 @@ proc_prettyprint_syscalls (sysset_t *sysset, int verbose)
 \f
 /* Prettyprint signals.  */
 
 \f
 /* Prettyprint signals.  */
 

-/* Signal translation table.  */
+/* Signal translation table, ordered ANSI-standard signals first,
+   other signals second, with signals in each block ordered by their
+   numerical values on a typical POSIX platform.  */

 
 static struct trans signal_table[] = 
 {
   { 0,      "<no signal>", "no signal" }, 
 
 static struct trans signal_table[] = 
 {
   { 0,      "<no signal>", "no signal" }, 

+
+  /* SIGINT, SIGILL, SIGABRT, SIGFPE, SIGSEGV and SIGTERM
+     are ANSI-standard signals and are always available.  */
+
+  { SIGINT, "SIGINT", "Interrupt (rubout)" },
+  { SIGILL, "SIGILL", "Illegal instruction" }, /* not reset when caught */
+  { SIGABRT, "SIGABRT", "used by abort()" },   /* replaces SIGIOT */
+  { SIGFPE, "SIGFPE", "Floating point exception" },
+  { SIGSEGV, "SIGSEGV", "Segmentation violation" },
+  { SIGTERM, "SIGTERM", "Software termination signal from kill" },
+
+  /* All other signals need preprocessor conditionals.  */
+

 #ifdef SIGHUP
   { SIGHUP, "SIGHUP", "Hangup" },
 #endif
 #ifdef SIGHUP
   { SIGHUP, "SIGHUP", "Hangup" },
 #endif

-#ifdef SIGINT
-  { SIGINT, "SIGINT", "Interrupt (rubout)" },
-#endif

 #ifdef SIGQUIT
   { SIGQUIT, "SIGQUIT", "Quit (ASCII FS)" },
 #endif
 #ifdef SIGQUIT
   { SIGQUIT, "SIGQUIT", "Quit (ASCII FS)" },
 #endif

-#ifdef SIGILL
-  { SIGILL, "SIGILL", "Illegal instruction" }, /* not reset when caught */
-#endif

 #ifdef SIGTRAP
   { SIGTRAP, "SIGTRAP", "Trace trap" },                /* not reset when caught */
 #endif
 #ifdef SIGTRAP
   { SIGTRAP, "SIGTRAP", "Trace trap" },                /* not reset when caught */
 #endif

-#ifdef SIGABRT
-  { SIGABRT, "SIGABRT", "used by abort()" },   /* replaces SIGIOT */
-#endif

 #ifdef SIGIOT
   { SIGIOT, "SIGIOT", "IOT instruction" },
 #endif
 #ifdef SIGEMT
   { SIGEMT, "SIGEMT", "EMT instruction" },
 #endif
 #ifdef SIGIOT
   { SIGIOT, "SIGIOT", "IOT instruction" },
 #endif
 #ifdef SIGEMT
   { SIGEMT, "SIGEMT", "EMT instruction" },
 #endif

-#ifdef SIGFPE
-  { SIGFPE, "SIGFPE", "Floating point exception" },
-#endif

 #ifdef SIGKILL
   { SIGKILL, "SIGKILL", "Kill" },      /* Solaris: cannot be caught/ignored */
 #endif
 #ifdef SIGBUS
   { SIGBUS, "SIGBUS", "Bus error" },
 #endif
 #ifdef SIGKILL
   { SIGKILL, "SIGKILL", "Kill" },      /* Solaris: cannot be caught/ignored */
 #endif
 #ifdef SIGBUS
   { SIGBUS, "SIGBUS", "Bus error" },
 #endif

-#ifdef SIGSEGV
-  { SIGSEGV, "SIGSEGV", "Segmentation violation" },
-#endif

 #ifdef SIGSYS
   { SIGSYS, "SIGSYS", "Bad argument to system call" },
 #endif
 #ifdef SIGSYS
   { SIGSYS, "SIGSYS", "Bad argument to system call" },
 #endif


@@ -1446,9 +1445,6 @@ static struct trans signal_table[] =
 #ifdef SIGALRM
   { SIGALRM, "SIGALRM", "Alarm clock" },
 #endif
 #ifdef SIGALRM
   { SIGALRM, "SIGALRM", "Alarm clock" },
 #endif

-#ifdef SIGTERM
-  { SIGTERM, "SIGTERM", "Software termination signal from kill" },
-#endif

 #ifdef SIGUSR1
   { SIGUSR1, "SIGUSR1", "User defined signal 1" },
 #endif
 #ifdef SIGUSR1
   { SIGUSR1, "SIGUSR1", "User defined signal 1" },
 #endif