1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
Description: Address FTBFS w/GCC-15 (Closes: #1097413)
Author: tony mancill <tmancill@debian.org>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1097413
--- a/morse.d/alarm.c
+++ b/morse.d/alarm.c
@@ -14,8 +14,8 @@
static bool alarmPending = false; /* Nonzero when the alarm is set. */
-static void ualarm();
-static void AlarmHandler();
+static void ualarm(unsigned, unsigned);
+static void AlarmHandler(int);
void AlarmSet(int time) {
struct sigaction handler;
@@ -53,7 +53,7 @@
sigprocmask(SIG_SETMASK, &orig_mask, NULL);
}
-static void ualarm(unsigned us) {
+static void ualarm(unsigned us, unsigned dummy) {
struct itimerval rttimer, old_rttimer;
rttimer.it_value.tv_sec = us / 1000000;
@@ -66,4 +66,4 @@
}
}
-static void AlarmHandler() { alarmPending = false; }
+static void AlarmHandler(int dummy) { alarmPending = false; }
--- a/morse.d/morse.c
+++ b/morse.d/morse.c
@@ -231,7 +231,7 @@
static void closeterminal(void);
static void report(void);
-static void die(), suspend();
+static void die(int), suspend(int);
static void cleanup();
int main(int argc, char **argv) {
@@ -1439,7 +1439,7 @@
"TESTBUFSZ bigger!\n");
fprintf(stderr, "(Or don't fall so far behind)\n");
- die();
+ die(0);
}
/*
@@ -1465,7 +1465,7 @@
fprintf(stderr, "(Or don't type so far ahead... how did you "
"expect to get them right anyway?)\n");
- die();
+ die(0);
}
}
@@ -1555,7 +1555,7 @@
report();
if (yourchar == (int)'\004') {
- die();
+ die(0);
}
} else if (yourchar == '\b') {
helpmeflag = true;
@@ -1855,7 +1855,7 @@
close(termfd);
}
-static void die(void) {
+static void die(int sig) {
cleanup();
exit(1);
}
|
