From 4233de2df1aafa692f47dd945bf915bf2d59b076 Mon Sep 17 00:00:00 2001 From: dmiller Date: Wed, 15 Jul 2026 23:35:13 +0000 Subject: [PATCH] Avoid semicolon after do{}while(0) macro definition --- libdnet-stripped/include/dnet/ip6.h | 2 +- libnetutil/netutil.cc | 2 +- ncat/http.c | 2 +- ncat/util.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libdnet-stripped/include/dnet/ip6.h b/libdnet-stripped/include/dnet/ip6.h index 66ef9a78b..46c9b08d3 100644 --- a/libdnet-stripped/include/dnet/ip6.h +++ b/libdnet-stripped/include/dnet/ip6.h @@ -171,7 +171,7 @@ struct ip6_ext_hdr { ip6->ip6_nxt = (nxt); ip6->ip6_hlim = (hlim); \ memmove(&ip6->ip6_src, &(src), IP6_ADDR_LEN); \ memmove(&ip6->ip6_dst, &(dst), IP6_ADDR_LEN); \ -} while (0); +} while (0) __BEGIN_DECLS char *ip6_ntop(const ip6_addr_t *ip6, char *dst, size_t size); diff --git a/libnetutil/netutil.cc b/libnetutil/netutil.cc index ba7cfe71a..4d6212bd5 100644 --- a/libnetutil/netutil.cc +++ b/libnetutil/netutil.cc @@ -3134,7 +3134,7 @@ pcap_t *my_pcap_open_live(const char *device, int snaplen, int promisc, int to_m pcap_close(p_t);\ return NULL;\ }\ -} while(0); +} while(0) MY_PCAP_SET(pcap_set_snaplen, pt, snaplen); MY_PCAP_SET(pcap_set_promisc, pt, promisc); diff --git a/ncat/http.c b/ncat/http.c index 57cc96b6f..570e67aa2 100644 --- a/ncat/http.c +++ b/ncat/http.c @@ -220,7 +220,7 @@ void uri_init(struct uri *uri) #define FREE_AND_NULL(_FreeFunc, _P) do { \ _FreeFunc(_P); \ _P = NULL; \ -} while (0); +} while (0) void uri_free(struct uri *uri) { diff --git a/ncat/util.h b/ncat/util.h index 3f469aab9..7c4765829 100644 --- a/ncat/util.h +++ b/ncat/util.h @@ -81,7 +81,7 @@ if (strlen(_Source) > sizeof((_Sock)->un.sun_path) - 1) \ bye("Socket path length is too long. Max: %lu", sizeof((_Sock)->un.sun_path) - 1); \ strncpy((_Sock)->un.sun_path, _Source, sizeof((_Sock)->un.sun_path) - 1); \ -} while (0); +} while (0) #endif