diff options
| author | David Lamparter <equinox@diac24.net> | 2021-02-21 06:18:10 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2021-03-17 06:18:17 +0100 |
| commit | bf8d3d6aca3f20255a621ed1c148fd05b3a8ae5c (patch) | |
| tree | cd62a7c64fe8eb9f3252e1b608f1fb939c2a772c /eigrpd | |
| parent | 15c05f1edf079bc03b277e44426a8af8616bb10b (diff) | |
*: require semicolon after DEFINE_MTYPE & co
Back when I put this together in 2015, ISO C11 was still reasonably new
and we couldn't require it just yet. Without ISO C11, there is no
"good" way (only bad hacks) to require a semicolon after a macro that
ends with a function definition. And if you added one anyway, you'd get
"spurious semicolon" warnings on some compilers...
With C11, `_Static_assert()` at the end of a macro will make it so that
the semicolon is properly required, consumed, and not warned about.
Consistently requiring semicolons after "file-level" macros matches
Linux kernel coding style and helps some editors against mis-syntax'ing
these macros.
Signed-off-by: David Lamparter <equinox@diac24.net>
Diffstat (limited to 'eigrpd')
| -rw-r--r-- | eigrpd/eigrp_memory.c | 30 | ||||
| -rw-r--r-- | eigrpd/eigrp_memory.h | 30 |
2 files changed, 30 insertions, 30 deletions
diff --git a/eigrpd/eigrp_memory.c b/eigrpd/eigrp_memory.c index 57ca785340..f2cb9a5c98 100644 --- a/eigrpd/eigrp_memory.c +++ b/eigrpd/eigrp_memory.c @@ -25,18 +25,18 @@ #include "eigrp_memory.h" -DEFINE_MGROUP(EIGRPD, "eigrpd") -DEFINE_MTYPE(EIGRPD, EIGRP_TOP, "EIGRP structure") -DEFINE_MTYPE(EIGRPD, EIGRP_IF, "EIGRP interface") -DEFINE_MTYPE(EIGRPD, EIGRP_NEIGHBOR, "EIGRP neighbor") -DEFINE_MTYPE(EIGRPD, EIGRP_IF_PARAMS, "EIGRP Interface Parameters") -DEFINE_MTYPE(EIGRPD, EIGRP_IF_INFO, "EIGRP Interface Information") -DEFINE_MTYPE(EIGRPD, EIGRP_FIFO, "EIGRP FIFO") -DEFINE_MTYPE(EIGRPD, EIGRP_PACKET, "EIGRP Packet") -DEFINE_MTYPE(EIGRPD, EIGRP_IPV4_INT_TLV, "EIGRP IPv4 TLV") -DEFINE_MTYPE(EIGRPD, EIGRP_SEQ_TLV, "EIGRP SEQ TLV") -DEFINE_MTYPE(EIGRPD, EIGRP_AUTH_TLV, "EIGRP AUTH TLV") -DEFINE_MTYPE(EIGRPD, EIGRP_AUTH_SHA256_TLV, "EIGRP SHA TLV") -DEFINE_MTYPE(EIGRPD, EIGRP_PREFIX_DESCRIPTOR, "EIGRP Prefix") -DEFINE_MTYPE(EIGRPD, EIGRP_ROUTE_DESCRIPTOR, "EIGRP Nexthop Entry") -DEFINE_MTYPE(EIGRPD, EIGRP_FSM_MSG, "EIGRP FSM Message") +DEFINE_MGROUP(EIGRPD, "eigrpd"); +DEFINE_MTYPE(EIGRPD, EIGRP_TOP, "EIGRP structure"); +DEFINE_MTYPE(EIGRPD, EIGRP_IF, "EIGRP interface"); +DEFINE_MTYPE(EIGRPD, EIGRP_NEIGHBOR, "EIGRP neighbor"); +DEFINE_MTYPE(EIGRPD, EIGRP_IF_PARAMS, "EIGRP Interface Parameters"); +DEFINE_MTYPE(EIGRPD, EIGRP_IF_INFO, "EIGRP Interface Information"); +DEFINE_MTYPE(EIGRPD, EIGRP_FIFO, "EIGRP FIFO"); +DEFINE_MTYPE(EIGRPD, EIGRP_PACKET, "EIGRP Packet"); +DEFINE_MTYPE(EIGRPD, EIGRP_IPV4_INT_TLV, "EIGRP IPv4 TLV"); +DEFINE_MTYPE(EIGRPD, EIGRP_SEQ_TLV, "EIGRP SEQ TLV"); +DEFINE_MTYPE(EIGRPD, EIGRP_AUTH_TLV, "EIGRP AUTH TLV"); +DEFINE_MTYPE(EIGRPD, EIGRP_AUTH_SHA256_TLV, "EIGRP SHA TLV"); +DEFINE_MTYPE(EIGRPD, EIGRP_PREFIX_DESCRIPTOR, "EIGRP Prefix"); +DEFINE_MTYPE(EIGRPD, EIGRP_ROUTE_DESCRIPTOR, "EIGRP Nexthop Entry"); +DEFINE_MTYPE(EIGRPD, EIGRP_FSM_MSG, "EIGRP FSM Message"); diff --git a/eigrpd/eigrp_memory.h b/eigrpd/eigrp_memory.h index 21ecba2aae..bf1eff8751 100644 --- a/eigrpd/eigrp_memory.h +++ b/eigrpd/eigrp_memory.h @@ -24,20 +24,20 @@ #include "memory.h" -DECLARE_MGROUP(EIGRPD) -DECLARE_MTYPE(EIGRP_TOP) -DECLARE_MTYPE(EIGRP_IF) -DECLARE_MTYPE(EIGRP_NEIGHBOR) -DECLARE_MTYPE(EIGRP_IF_PARAMS) -DECLARE_MTYPE(EIGRP_IF_INFO) -DECLARE_MTYPE(EIGRP_FIFO) -DECLARE_MTYPE(EIGRP_PACKET) -DECLARE_MTYPE(EIGRP_IPV4_INT_TLV) -DECLARE_MTYPE(EIGRP_SEQ_TLV) -DECLARE_MTYPE(EIGRP_AUTH_TLV) -DECLARE_MTYPE(EIGRP_AUTH_SHA256_TLV) -DECLARE_MTYPE(EIGRP_PREFIX_DESCRIPTOR) -DECLARE_MTYPE(EIGRP_ROUTE_DESCRIPTOR) -DECLARE_MTYPE(EIGRP_FSM_MSG) +DECLARE_MGROUP(EIGRPD); +DECLARE_MTYPE(EIGRP_TOP); +DECLARE_MTYPE(EIGRP_IF); +DECLARE_MTYPE(EIGRP_NEIGHBOR); +DECLARE_MTYPE(EIGRP_IF_PARAMS); +DECLARE_MTYPE(EIGRP_IF_INFO); +DECLARE_MTYPE(EIGRP_FIFO); +DECLARE_MTYPE(EIGRP_PACKET); +DECLARE_MTYPE(EIGRP_IPV4_INT_TLV); +DECLARE_MTYPE(EIGRP_SEQ_TLV); +DECLARE_MTYPE(EIGRP_AUTH_TLV); +DECLARE_MTYPE(EIGRP_AUTH_SHA256_TLV); +DECLARE_MTYPE(EIGRP_PREFIX_DESCRIPTOR); +DECLARE_MTYPE(EIGRP_ROUTE_DESCRIPTOR); +DECLARE_MTYPE(EIGRP_FSM_MSG); #endif /* _FRR_EIGRP_MEMORY_H */ |