blob: e3e640e47883718e218741454a8a986e0923d72e (
plain)
1 diff --unified -r src/ArpON-3.0-ng/src/opt.c src-gcc7fix/ArpON-3.0-ng/src/opt.c
2 --- src/ArpON-3.0-ng/src/opt.c 2016-01-28 20:56:19.000000000 -0500
3 +++ src-gcc7fix/ArpON-3.0-ng/src/opt.c 2017-05-31 02:22:54.053601192 -0400
4 @@ -222,6 +222,8 @@
5 /* Print the version command option, cleanup and exit. */
6 std_version();
7 exit_cleanup(true);
8 + /* Explicit break because exit_cleanup conditionally exits (noreturn unsuitable). */
9 + break;
10
11 case 'h':
12 MSG_DEBUG("-h or --help command option");
13 @@ -229,6 +231,8 @@
14 /* Print the help screen command option, cleanup and exit. */
15 std_help();
16 exit_cleanup(true);
17 + /* Explicit break because exit_cleanup conditionally exits (noreturn unsuitable). */
18 + break;
19
20 case '?':
21 case ':':
22 @@ -285,7 +289,7 @@
23 }
24
25 /* Re-initialize the interface name command option to no interface? */
26 - if (opt->interface != '\0')
27 + if (opt->interface[0] != '\0')
28 memset(opt->interface, '\0', (size_t)IF_NAMESIZE);
29
30 /* Set the value of the interface name command option. */
31 diff --unified -r src/ArpON-3.0-ng/src/sig.c src-gcc7fix/ArpON-3.0-ng/src/sig.c
32 --- src/ArpON-3.0-ng/src/sig.c 2016-01-28 21:06:37.000000000 -0500
33 +++ src-gcc7fix/ArpON-3.0-ng/src/sig.c 2017-05-31 02:17:58.216940834 -0400
34 @@ -204,6 +204,7 @@
35 case SIGINT:
36 /* Remove ^C symbol from the output terminal. */
37 printf("\r");
38 + __attribute__ ((fallthrough));
39
40 case SIGTERM:
41 MSG_DEBUG("Caught %s (%d)..", SIG_ITOA(sig), sig);
|