diff options
| author | Donatas Abraitis <donatas.abraitis@gmail.com> | 2021-03-22 10:00:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-22 10:00:34 +0100 |
| commit | 37916b2b113af12d86208b9abdd594647421d65c (patch) | |
| tree | ffc76feaddd010df2bfdf653a610bcc1929ca98a /bfdd | |
| parent | Merge pull request #8297 from adrianomarto/msdp-dscp-cs6 (diff) | |
| parent | lib: temporary workaround for LabN CI (diff) | |
| download | frr-37916b2b113af12d86208b9abdd594647421d65c.tar.xz frr-37916b2b113af12d86208b9abdd594647421d65c.zip | |
Merge pull request #8121 from opensourcerouting/macro-cleanup
*: require ISO C11 + semicolons after file-scope macros
Diffstat (limited to 'bfdd')
| -rw-r--r-- | bfdd/bfd.c | 8 | ||||
| -rw-r--r-- | bfdd/bfd.h | 6 | ||||
| -rw-r--r-- | bfdd/bfdd.c | 9 | ||||
| -rw-r--r-- | bfdd/config.c | 2 | ||||
| -rw-r--r-- | bfdd/dplane.c | 3 |
5 files changed, 15 insertions, 13 deletions
diff --git a/bfdd/bfd.c b/bfdd/bfd.c index 9e5bc20a4..234fc6d39 100644 --- a/bfdd/bfd.c +++ b/bfdd/bfd.c @@ -32,10 +32,10 @@ #include "bfd.h" -DEFINE_MTYPE_STATIC(BFDD, BFDD_CONFIG, "long-lived configuration memory") -DEFINE_MTYPE_STATIC(BFDD, BFDD_PROFILE, "long-lived profile memory") -DEFINE_MTYPE_STATIC(BFDD, BFDD_SESSION_OBSERVER, "Session observer") -DEFINE_MTYPE_STATIC(BFDD, BFDD_VRF, "BFD VRF") +DEFINE_MTYPE_STATIC(BFDD, BFDD_CONFIG, "long-lived configuration memory"); +DEFINE_MTYPE_STATIC(BFDD, BFDD_PROFILE, "long-lived profile memory"); +DEFINE_MTYPE_STATIC(BFDD, BFDD_SESSION_OBSERVER, "Session observer"); +DEFINE_MTYPE_STATIC(BFDD, BFDD_VRF, "BFD VRF"); /* * Prototypes diff --git a/bfdd/bfd.h b/bfdd/bfd.h index 503b5ca7d..a86c1bb9f 100644 --- a/bfdd/bfd.h +++ b/bfdd/bfd.h @@ -41,9 +41,9 @@ #define BFDD_JSON_CONV_OPTIONS (0) #endif -DECLARE_MGROUP(BFDD) -DECLARE_MTYPE(BFDD_CONTROL) -DECLARE_MTYPE(BFDD_NOTIFICATION) +DECLARE_MGROUP(BFDD); +DECLARE_MTYPE(BFDD_CONTROL); +DECLARE_MTYPE(BFDD_NOTIFICATION); struct bfd_timers { uint32_t desired_min_tx; diff --git a/bfdd/bfdd.c b/bfdd/bfdd.c index 0cac99010..7a2c3cc3a 100644 --- a/bfdd/bfdd.c +++ b/bfdd/bfdd.c @@ -41,9 +41,9 @@ /* * FRR related code. */ -DEFINE_MGROUP(BFDD, "Bidirectional Forwarding Detection Daemon") -DEFINE_MTYPE(BFDD, BFDD_CONTROL, "long-lived control socket memory") -DEFINE_MTYPE(BFDD, BFDD_NOTIFICATION, "short-lived control notification data") +DEFINE_MGROUP(BFDD, "Bidirectional Forwarding Detection Daemon"); +DEFINE_MTYPE(BFDD, BFDD_CONTROL, "long-lived control socket memory"); +DEFINE_MTYPE(BFDD, BFDD_NOTIFICATION, "short-lived control notification data"); /* Master of threads. */ struct thread_master *master; @@ -134,7 +134,8 @@ FRR_DAEMON_INFO(bfdd, BFD, .vty_port = 2617, .signals = bfd_signals, .n_signals = array_size(bfd_signals), .privs = &bglobal.bfdd_privs, .yang_modules = bfdd_yang_modules, - .n_yang_modules = array_size(bfdd_yang_modules)) + .n_yang_modules = array_size(bfdd_yang_modules), +); #define OPTION_CTLSOCK 1001 #define OPTION_DPLANEADDR 2000 diff --git a/bfdd/config.c b/bfdd/config.c index a97caf137..22ec91235 100644 --- a/bfdd/config.c +++ b/bfdd/config.c @@ -30,7 +30,7 @@ #include "bfd.h" -DEFINE_MTYPE_STATIC(BFDD, BFDD_LABEL, "long-lived label memory") +DEFINE_MTYPE_STATIC(BFDD, BFDD_LABEL, "long-lived label memory"); /* * Definitions diff --git a/bfdd/dplane.c b/bfdd/dplane.c index 9cb0b0ea8..6fb301d46 100644 --- a/bfdd/dplane.c +++ b/bfdd/dplane.c @@ -46,7 +46,8 @@ #include "lib/openbsd-queue.h" -DEFINE_MTYPE_STATIC(BFDD, BFDD_DPLANE_CTX, "Data plane client allocated memory") +DEFINE_MTYPE_STATIC(BFDD, BFDD_DPLANE_CTX, + "Data plane client allocated memory"); /** Data plane client socket buffer size. */ #define BFD_DPLANE_CLIENT_BUF_SIZE 8192 |