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 /sharpd | |
| 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 'sharpd')
| -rw-r--r-- | sharpd/sharp_globals.h | 2 | ||||
| -rw-r--r-- | sharpd/sharp_main.c | 5 | ||||
| -rw-r--r-- | sharpd/sharp_nht.c | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/sharpd/sharp_globals.h b/sharpd/sharp_globals.h index 52561fd45..ecb7053fd 100644 --- a/sharpd/sharp_globals.h +++ b/sharpd/sharp_globals.h @@ -22,7 +22,7 @@ #ifndef __SHARP_GLOBAL_H__ #define __SHARP_GLOBAL_H__ -DECLARE_MGROUP(SHARPD) +DECLARE_MGROUP(SHARPD); struct sharp_routes { /* The original prefix for route installation */ diff --git a/sharpd/sharp_main.c b/sharpd/sharp_main.c index fe7f9851f..a1216247c 100644 --- a/sharpd/sharp_main.c +++ b/sharpd/sharp_main.c @@ -49,7 +49,7 @@ #include "sharp_globals.h" #include "sharp_nht.h" -DEFINE_MGROUP(SHARPD, "sharpd") +DEFINE_MGROUP(SHARPD, "sharpd"); zebra_capabilities_t _caps_p[] = { }; @@ -129,7 +129,8 @@ FRR_DAEMON_INFO(sharpd, SHARP, .vty_port = SHARP_VTY_PORT, .n_signals = array_size(sharp_signals), .privs = &sharp_privs, .yang_modules = sharpd_yang_modules, - .n_yang_modules = array_size(sharpd_yang_modules), ) + .n_yang_modules = array_size(sharpd_yang_modules), +); struct sharp_global sg; diff --git a/sharpd/sharp_nht.c b/sharpd/sharp_nht.c index bed0ebfa2..a90387186 100644 --- a/sharpd/sharp_nht.c +++ b/sharpd/sharp_nht.c @@ -32,8 +32,8 @@ #include "sharp_globals.h" #include "sharp_zebra.h" -DEFINE_MTYPE_STATIC(SHARPD, NH_TRACKER, "Nexthop Tracker") -DEFINE_MTYPE_STATIC(SHARPD, NHG, "Nexthop Group") +DEFINE_MTYPE_STATIC(SHARPD, NH_TRACKER, "Nexthop Tracker"); +DEFINE_MTYPE_STATIC(SHARPD, NHG, "Nexthop Group"); struct sharp_nh_tracker *sharp_nh_tracker_get(struct prefix *p) { |