Skip to content

Commit fa1a14a

Browse files
committed
Fix clang-tidy complaints. No actual changes.
1 parent 797b735 commit fa1a14a

File tree

4 files changed

+30
-4
lines changed

4 files changed

+30
-4
lines changed

extra/tidy.sh

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#!/usr/bin/env bash
2+
3+
set -e
4+
5+
# src/findif_bsdroute.c
6+
# src/windows.c
7+
# src/findif_linux.c
8+
# src/findif_sysctl.c
9+
for f in src/arping.c \
10+
src/arping_main.c \
11+
src/arping_test.c \
12+
src/cast.c \
13+
src/findif_getifaddrs.c \
14+
src/findif_other.c \
15+
src/fuzz_pingip.c \
16+
src/fuzz_pingmac.c \
17+
src/mock_libnet.c \
18+
src/mock_libpcap.c \
19+
src/unix.c; do
20+
echo "========================================================="
21+
echo "Checking ${f?}"
22+
clang-tidy "${f?}" -- -DHAVE_CONFIG_H -I. -I.. -D_DEFAULT_SOURCE=1 -std=c99
23+
done

src/arping.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include "config.h"
3636
#endif
3737

38+
#include <assert.h>
3839
#include <errno.h>
3940
#include <stdio.h>
4041
#include <stdlib.h>
@@ -1297,8 +1298,6 @@ pingmac_send(uint16_t id, uint16_t seq)
12971298
payload_suffix, payload_suffix_size);
12981299
}
12991300

1300-
int c;
1301-
13021301
if (-1 == (icmp = libnet_build_icmpv4_echo(ICMP_ECHO, /* type */
13031302
0, /* code */
13041303
0, /* checksum */
@@ -1366,7 +1365,7 @@ pingmac_send(uint16_t id, uint16_t seq)
13661365
(long)lastpacketsent.tv_sec,
13671366
(long)lastpacketsent.tv_nsec);
13681367
}
1369-
if (-1 == (c = libnet_write(libnet))) {
1368+
if (-1 == libnet_write(libnet)) {
13701369
fprintf(stderr, "arping: libnet_write(): %s\n",
13711370
libnet_geterror(libnet));
13721371
sigint(0);
@@ -1464,6 +1463,7 @@ pingip_recv(const char *unused, struct pcap_pkthdr *h, const char * const packet
14641463
struct libnet_arp_hdr *harp;
14651464
struct timespec arrival;
14661465
UNUSED(unused);
1466+
assert(packet);
14671467

14681468
if (verbose > 2) {
14691469
printf("arping: received response for IP ping\n");
@@ -1671,6 +1671,7 @@ pingmac_recv(const char* unused, struct pcap_pkthdr *h, uint8_t *packet)
16711671
struct libnet_icmpv4_hdr *hicmp;
16721672
struct timespec arrival;
16731673
UNUSED(unused);
1674+
assert(packet);
16741675

16751676
if(verbose>2) {
16761677
printf("arping: received response for mac ping\n");

src/arping_test.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ START_TEST(test_mkpacket)
232232
dump_packet(packet, pkthdr.caplen);
233233
}
234234
fail_unless(!memcmp(packet, correct_packet, pkthdr.caplen));
235+
free(packet);
235236
} END_TEST
236237

237238

@@ -437,7 +438,7 @@ START_TEST(strip_newline_test)
437438
int c;
438439
for (c = 0; tests[c][0]; c++){
439440
char buf[128];
440-
strcpy(buf, tests[c][0]);
441+
snprintf(buf, sizeof(buf), "%s", tests[c][0]);
441442
strip_newline(buf);
442443
fail_unless(!strcmp(buf, tests[c][1]));
443444
}

src/fuzz_pingmac.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#include<string.h>
33
#include<stdio.h>
44
#include<stdlib.h>
5+
#include<time.h>
56
#include<unistd.h>
67
#include<inttypes.h>
78

0 commit comments

Comments
 (0)