From 2a08a7650bed11c5f78c68d73c8f43fe74eca8e5 Mon Sep 17 00:00:00 2001 From: Gabriel Ganne Date: Thu, 2 May 2019 09:16:12 +0200 Subject: [PATCH 1/2] silence unused parameter warnings Those are mostly parameters being only used with netmap --- src/common/sendpacket.c | 2 +- src/send_packets.c | 3 ++- src/sleep.h | 4 ++-- src/tcpreplay_api.c | 6 +++--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/common/sendpacket.c b/src/common/sendpacket.c index 431d2e991..237d2b178 100644 --- a/src/common/sendpacket.c +++ b/src/common/sendpacket.c @@ -471,7 +471,7 @@ sendpacket(sendpacket_t *sp, const u_char *data, size_t len, struct pcap_pkthdr */ sendpacket_t * sendpacket_open(const char *device, char *errbuf, tcpr_dir_t direction, - sendpacket_type_t sendpacket_type, void *arg) + sendpacket_type_t sendpacket_type _U_, void *arg _U_) { sendpacket_t *sp; struct stat sdata; diff --git a/src/send_packets.c b/src/send_packets.c index 68761f652..1c2777e06 100644 --- a/src/send_packets.c +++ b/src/send_packets.c @@ -226,7 +226,8 @@ fast_edit_packet_dl(struct pcap_pkthdr *pkthdr, u_char **pktdata, dbgx(1, "(%u): final src_ip=0x%08x dst_ip=0x%08x", iteration, src_ip, dst_ip); } -static inline void wake_send_queues(sendpacket_t *sp, tcpreplay_opt_t *options) +static inline void wake_send_queues(sendpacket_t *sp _U_, + tcpreplay_opt_t *options _U_) { #ifdef HAVE_NETMAP if (options->netmap) diff --git a/src/sleep.h b/src/sleep.h index 7f1285719..83b389ee4 100644 --- a/src/sleep.h +++ b/src/sleep.h @@ -74,7 +74,7 @@ nanosleep_sleep(sendpacket_t *sp _U_, const struct timespec *nap, */ static inline void gettimeofday_sleep(sendpacket_t *sp _U_, struct timespec *nap, - struct timeval *now, bool flush) + struct timeval *now, bool flush _U_) { struct timeval sleep_until, nap_for; #ifdef HAVE_NETMAP @@ -116,7 +116,7 @@ gettimeofday_sleep(sendpacket_t *sp _U_, struct timespec *nap, */ static inline void select_sleep(sendpacket_t *sp _U_, const struct timespec *nap, - struct timeval *now, bool flush) + struct timeval *now, bool flush _U_) { struct timeval timeout; #ifdef HAVE_NETMAP diff --git a/src/tcpreplay_api.c b/src/tcpreplay_api.c index b97742251..a63e253c0 100644 --- a/src/tcpreplay_api.c +++ b/src/tcpreplay_api.c @@ -769,7 +769,7 @@ tcpreplay_set_tcpprep_cache(tcpreplay_t *ctx, char *file) * Enable verbose mode */ int -tcpreplay_set_verbose(tcpreplay_t *ctx, bool value) +tcpreplay_set_verbose(tcpreplay_t *ctx, bool value _U_) { assert(ctx); #ifdef ENABLE_VERBOSE @@ -788,7 +788,7 @@ tcpreplay_set_verbose(tcpreplay_t *ctx, bool value) * verbose mode. See TCPDUMP_ARGS in tcpdump.h for the default options */ int -tcpreplay_set_tcpdump_args(tcpreplay_t *ctx, char *value) +tcpreplay_set_tcpdump_args(tcpreplay_t *ctx, char *value _U_) { assert(ctx); #ifdef ENABLE_VERBOSE @@ -808,7 +808,7 @@ tcpreplay_set_tcpdump_args(tcpreplay_t *ctx, char *value) * tcpdump lives */ int -tcpreplay_set_tcpdump(tcpreplay_t *ctx, tcpdump_t *value) +tcpreplay_set_tcpdump(tcpreplay_t *ctx, tcpdump_t *value _U_) { assert(ctx); #ifdef ENABLE_VERBOSE From 3888c09ffe3bbdf7818d421ec4a39b2528e8c62a Mon Sep 17 00:00:00 2001 From: Gabriel Ganne Date: Thu, 2 May 2019 10:07:06 +0200 Subject: [PATCH 2/2] silence some Wimplicit-fallthrough warnings rename somme comments from "no break" to "fallthrough" in order to silence gcc where needed --- libopts/boolean.c | 2 +- libopts/configfile.c | 1 + src/common/flows.c | 2 +- src/common/get.c | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libopts/boolean.c b/libopts/boolean.c index 1187c2da0..f81c2d63d 100644 --- a/libopts/boolean.c +++ b/libopts/boolean.c @@ -64,8 +64,8 @@ optionBooleanVal(tOptions * opts, tOptDesc * od) long val = strtol(od->optArg.argString, &pz, 0); if ((val != 0) || (*pz != NUL)) break; - /* FALLTHROUGH */ } + /* FALLTHROUGH */ case 'N': case 'n': case 'F': diff --git a/libopts/configfile.c b/libopts/configfile.c index 75f7f53b2..ae733e27c 100644 --- a/libopts/configfile.c +++ b/libopts/configfile.c @@ -466,6 +466,7 @@ file_preset(tOptions * opts, char const * fname, int dir) ftext = strchr(ftext + 2, '>'); if (ftext++ != NULL) break; + /* fallthrough */ default: ftext = NULL; diff --git a/src/common/flows.c b/src/common/flows.c index 14b14eab0..67e75b984 100644 --- a/src/common/flows.c +++ b/src/common/flows.c @@ -234,7 +234,7 @@ flow_entry_type_t flow_decode(flow_hash_table_t *fht, const struct pcap_pkthdr * l2_len = 4; /* no header extensions */ } - /* no break */ + /* fallthrough */ case DLT_EN10MB: /* set l2_len if we did not fell through */ if (l2_len == 0) diff --git a/src/common/get.c b/src/common/get.c index 9e730cf66..bcb78466b 100644 --- a/src/common/get.c +++ b/src/common/get.c @@ -105,7 +105,7 @@ get_l2protocol(const u_char *pktdata, const int datalen, const int datalink) } else { eth_hdr_offset = 4; /* no header extensions */ } - /* no break */ + /* fallthrough */ case DLT_EN10MB: if ((size_t)datalen >= (sizeof(eth_hdr_t) + eth_hdr_offset)) { vlan_hdr_t *vlan_hdr; @@ -173,7 +173,7 @@ get_l2len(const u_char *pktdata, const int datalen, const int datalink) case DLT_JUNIPER_ETHER: l2_len = 24; - /* no break */ + /* fallthrough */ case DLT_EN10MB: if ((size_t)datalen >= sizeof(eth_hdr_t) + l2_len) { uint16_t ether_type = ntohs(((eth_hdr_t*)(pktdata + l2_len))->ether_type);