bgpd: Fix warnings

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>

diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
index 56303a3df5f4d8d2c1ed6596103af55b2c4526b0..73256046f628963980613426ade13d154063f447 100644 (file)
--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@ -2143,10 +2143,10 @@ bgp_attr_pmsi_tunnel(struct bgp_attr_parser_args *args)
        if (tnl_type == PMSI_TNLTYPE_INGR_REPL) {
                if (length != 9) {
                        zlog_err("Bad PMSI tunnel attribute length %d for IR",
-                                length);
-                       return bgp_attr_malformed(args,
-                                                 BGP_NOTIFY_UPDATE_ATTR_LENG_ERR,
-                                                 args->total);
+                                length);
+                       return bgp_attr_malformed(
+                               args, BGP_NOTIFY_UPDATE_ATTR_LENG_ERR,
+                               args->total);
                }
        }
 

diff --git a/bgpd/bgp_debug.c b/bgpd/bgp_debug.c
index 1c9c92044c82a160598d66bd93b9f70817cf3449..8b308c8f3eab0cf2b7a1c2e285adedc5c64e3be5 100644 (file)
--- a/bgpd/bgp_debug.c
+++ b/bgpd/bgp_debug.c
@@ -419,8 +419,8 @@ int bgp_dump_attr(struct attr *attr, char *buf, size_t size)
        }
 
        if (CHECK_FLAG(attr->flag, ATTR_FLAG_BIT(BGP_ATTR_PMSI_TUNNEL)))
-               snprintf(buf + strlen(buf), size - strlen(buf), ", pmsi tnltype %u",
-                        attr->pmsi_tnl_type);
+               snprintf(buf + strlen(buf), size - strlen(buf),
+                        ", pmsi tnltype %u", attr->pmsi_tnl_type);
 
        if (CHECK_FLAG(attr->flag, ATTR_FLAG_BIT(BGP_ATTR_AS_PATH)))
                snprintf(buf + strlen(buf), size - strlen(buf), ", path %s",

diff --git a/bgpd/bgp_debug.h b/bgpd/bgp_debug.h
index 765e43f5b4330b4a87a3525129df7ecd6d5d39ea..10a1e3159ffaf231d8559b36815186955c9b1b5f 100644 (file)
--- a/bgpd/bgp_debug.h
+++ b/bgpd/bgp_debug.h
@@ -136,6 +136,7 @@ struct bgp_debug_filter {
 #define CONF_BGP_DEBUG(a, b)    (conf_bgp_debug_ ## a & BGP_DEBUG_ ## b)
 
 extern const char *bgp_type_str[];
+extern const char *pmsi_tnltype_str[];
 
 extern int bgp_dump_attr(struct attr *, char *, size_t);
 extern int bgp_debug_peer_updout_enabled(char *host);

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 93570f4a3c67882eae8f66f5a9e658dfd754e906..d9d82800271f8b16ebaf387d360ba98337dc26ea 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -81,7 +81,6 @@
 /* Extern from bgp_dump.c */
 extern const char *bgp_origin_str[];
 extern const char *bgp_origin_long_str[];
-extern const char *pmsi_tnltype_str[];
 
 struct bgp_node *bgp_afi_node_get(struct bgp_table *table, afi_t afi,
                                  safi_t safi, struct prefix *p,