ao-tools: Fix warnings in ao-tools

[fw/altos] / ao-tools / ao-dbg / ao-dbg-main.c

diff --git a/ao-tools/ao-dbg/ao-dbg-main.c b/ao-tools/ao-dbg/ao-dbg-main.c
index 25eca54b149cb7dae8ec654721ddd4ca043cbfd9..772701a94315543260b101747021a63ea213930e 100644 (file)
--- a/ao-tools/ao-dbg/ao-dbg-main.c
+++ b/ao-tools/ao-dbg/ao-dbg-main.c
@@ -50,7 +50,8 @@ usage(void)
        exit(1);
 }
 
-void s51_sigint()
+static void
+s51_sigint(int signum)
 {
        s51_interrupted = 1;
 }
@@ -64,9 +65,8 @@ static const struct option options[] = {
 int
 main(int argc, char **argv)
 {
-       int flags, opt;
+       int opt;
        char *endptr;
-       struct sigvec vec, ovec;
 
        while ((opt = getopt_long(argc, argv, "PVvHhmt:X:c:r:Z:s:S:p:T:", options, NULL)) != -1) {
                switch (opt) {
@@ -169,22 +169,16 @@ main(int argc, char **argv)
                                perror("fdopen");
                                exit(1);
                        }
-                       vec.sv_handler = SIG_IGN;
-                       vec.sv_mask = 0;
-                       vec.sv_flags = 0;
-                       sigvec(SIGINT, &vec, &ovec);
+                       signal(SIGINT, SIG_IGN);
                        command_read();
-                       sigvec(SIGINT, &ovec, NULL);
+                       signal(SIGINT, SIG_DFL);
                        fclose(s51_input);
                        fclose(s51_output);
                }
        } else {
                s51_input = stdin;
                s51_output = stdout;
-               vec.sv_handler = s51_sigint;
-               vec.sv_mask = 0;
-               vec.sv_flags = 0;
-               sigvec(SIGINT, &vec, &ovec);
+               signal(SIGINT, s51_sigint);
                command_read();
        }
        exit(0);
@@ -249,7 +243,6 @@ s51_check_input(void)
 {
        struct pollfd   input;
        int r;
-       int c;
 
        input.fd = fileno(s51_input);
        input.events = POLLIN;