"Modernize" all old-style function parameter declarations

[strace] / term.c

diff --git a/term.c b/term.c
index 0a741d54f8e527e842b17fadba4ded20809c3d07..23d2317f5161246e265b1c47335555066783700b 100644 (file)
--- a/term.c
+++ b/term.c
@@ -29,17 +29,26 @@
 
 #include "defs.h"
 
+#ifdef LINUX
+/*
+ * The C library's definition of struct termios might differ from
+ * the kernel one, and we need to use the kernel layout.
+ */
+#include <linux/termios.h>
+#else
+
 #ifdef HAVE_TERMIO_H
 #include <termio.h>
 #endif /* HAVE_TERMIO_H */
 
 #include <termios.h>
+#endif
 
 #ifdef HAVE_SYS_FILIO_H
 #include <sys/filio.h>
 #endif
 
-static struct xlat tcxonc_options[] = {
+static const struct xlat tcxonc_options[] = {
        { TCOOFF,       "TCOOFF"        },
        { TCOON,        "TCOON"         },
        { TCIOFF,       "TCIOFF"        },
@@ -48,7 +57,7 @@ static struct xlat tcxonc_options[] = {
 };
 
 #ifdef TCLFLSH
-static struct xlat tcflsh_options[] = {
+static const struct xlat tcflsh_options[] = {
        { TCIFLUSH,     "TCIFLUSH"      },
        { TCOFLUSH,     "TCOFLUSH"      },
        { TCIOFLUSH,    "TCIOFLUSH"     },
@@ -56,7 +65,7 @@ static struct xlat tcflsh_options[] = {
 };
 #endif
 
-static struct xlat baud_options[] = {
+static const struct xlat baud_options[] = {
        { B0,           "B0"            },
        { B50,          "B50"           },
        { B75,          "B75"           },
@@ -131,7 +140,7 @@ static struct xlat baud_options[] = {
        { 0,            NULL            },
 };
 
-static struct xlat modem_flags[] = {
+static const struct xlat modem_flags[] = {
 #ifdef TIOCM_LE
        { TIOCM_LE,     "TIOCM_LE",     },
 #endif
@@ -169,10 +178,7 @@ static struct xlat modem_flags[] = {
 };
 
 
-int
-term_ioctl(tcp, code, arg)
-struct tcb *tcp;
-long code, arg;
+int term_ioctl(struct tcb *tcp, long code, long arg)
 {
        struct termios tios;
 #ifndef FREEBSD
@@ -182,7 +188,7 @@ long code, arg;
        #define TCSETS  TIOCSETA
        #define TCSETSW TIOCSETAW
        #define TCSETSF TIOCSETAF
-#endif 
+#endif
        struct winsize ws;
 #ifdef TIOCGSIZE
        struct  ttysize ts;
@@ -207,7 +213,7 @@ long code, arg;
                        return 0;
                if (abbrev(tcp)) {
                        tprintf(", {");
-#ifndef FREEBSD                        
+#ifndef FREEBSD
                        printxval(baud_options, tios.c_cflag & CBAUD, "B???");
 #else
                        printxval(baud_options, tios.c_ispeed, "B???");
@@ -216,7 +222,7 @@ long code, arg;
                                printxval(baud_options, tios.c_ospeed, "B???");
                                tprintf(" (out)");
                        }
-#endif                 
+#endif
                        tprintf(" %sopost %sisig %sicanon %secho ...}",
                                (tios.c_oflag & OPOST) ? "" : "-",
                                (tios.c_lflag & ISIG) ? "" : "-",
@@ -328,11 +334,10 @@ long code, arg;
        case TIOCMBIS:
        case TIOCMBIC:
        case TIOCMSET:
-               if (umove(tcp, arg, &arg) < 0)
+               if (umove(tcp, arg, &i) < 0)
                        return 0;
                tprintf(", [");
-               if (!printflags(modem_flags, arg))
-                       tprintf("0");
+               printflags(modem_flags, i, "TIOCM_???");
                tprintf("]");
                return 1;
 #endif /* TIOCMGET */
@@ -406,17 +411,9 @@ long code, arg;
        case TIOCGPTN:
 #endif
                tprintf(", ");
-               printnum(tcp, arg, "%d");
+               printnum_int(tcp, arg, "%d");
                return 1;
 
-#if 0
-       /* ioctls with an indirect parameter displayed in hex */
-
-               tprintf(", ");
-               printnum(tcp, arg, "%#x");
-               return 1;
-#endif
-
        /* ioctls with an indirect parameter displayed as a char */
 
 #ifdef TIOCSTI
@@ -451,4 +448,3 @@ long code, arg;
                return 0;
        }
 }
-