make ANSI C compatible

[unix-history] / usr / src / usr.bin / systat / keyboard.c

diff --git a/usr/src/usr.bin/systat/keyboard.c b/usr/src/usr.bin/systat/keyboard.c
index 277dc92..9c35878 100644 (file)
--- a/usr/src/usr.bin/systat/keyboard.c
+++ b/usr/src/usr.bin/systat/keyboard.c
@@ -5,7 +5,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)keyboard.c 5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)keyboard.c 5.2 (Berkeley) %G%";

 #endif not lint
 
 /*
 #endif not lint
 
 /*


@@ -34,13 +34,13 @@ keyboard()
                                 ch += 'a' - 'A';
                         if (col == 0) {
 #define        mask(s) (1 << ((s) - 1))
                                 ch += 'a' - 'A';
                         if (col == 0) {
 #define        mask(s) (1 << ((s) - 1))

-                                if (ch == CTRL(l)) {
+                                if (ch == CTRL('l')) {

                                        oldmask = sigblock(mask(SIGALRM));
                                        wrefresh(curscr);
                                        sigsetmask(oldmask);
                                         continue;
                                 }
                                        oldmask = sigblock(mask(SIGALRM));
                                        wrefresh(curscr);
                                        sigsetmask(oldmask);
                                         continue;
                                 }

-                               if (ch == CTRL(g)) {
+                               if (ch == CTRL('g')) {

                                        oldmask = sigblock(mask(SIGALRM));
                                        status();
                                        sigsetmask(oldmask);
                                        oldmask = sigblock(mask(SIGALRM));
                                        status();
                                        sigsetmask(oldmask);


@@ -57,7 +57,7 @@ keyboard()
                                 col--;
                                 goto doerase;
                         }
                                 col--;
                                 goto doerase;
                         }

-                        if (ch == CTRL(w) && col > 0) {
+                        if (ch == CTRL('w') && col > 0) {

                                 while (--col >= 0 && isspace(line[col]))
                                         ;
                                 col++;
                                 while (--col >= 0 && isspace(line[col]))
                                         ;
                                 col++;