From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 2 Nov 2018 12:31:22 +0000 (-0400)
Subject: bgpd: Cleanup bgp_aggregate_set|get function names
X-Git-Tag: frr-7.1-dev~108^2~3
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=b613a9183fb8d6a75aab73084983b94a866a4c41;p=matthieu%2Ffrr.git

bgpd: Cleanup bgp_aggregate_set|get function names

The bgp_aggregate_set_node_info and bgp_aggregate_get_node_info
functions names were slightly backwards, rename to
bgp_node_get_bgp_aggregate_info and bgp_node_set_bgp_aggregate_info

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 8cb65262cd..1822c60322 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -5916,7 +5916,7 @@ void bgp_aggregate_increment(struct bgp *bgp, struct prefix *p,
 
 	/* Aggregate address configuration check. */
 	for (rn = child; rn; rn = bgp_node_parent_nolock(rn)) {
-		aggregate = bgp_aggregate_get_node_info(rn);
+		aggregate = bgp_node_get_bgp_aggregate_info(rn);
 		if (aggregate != NULL && rn->p.prefixlen < p->prefixlen) {
 			bgp_aggregate_delete(bgp, &rn->p, afi, safi, aggregate);
 			bgp_aggregate_route(bgp, &rn->p, pi, afi, safi, NULL,
@@ -5947,7 +5947,7 @@ void bgp_aggregate_decrement(struct bgp *bgp, struct prefix *p,
 
 	/* Aggregate address configuration check. */
 	for (rn = child; rn; rn = bgp_node_parent_nolock(rn)) {
-		aggregate = bgp_aggregate_get_node_info(rn);
+		aggregate = bgp_node_get_bgp_aggregate_info(rn);
 		if (aggregate != NULL && rn->p.prefixlen < p->prefixlen) {
 			bgp_aggregate_delete(bgp, &rn->p, afi, safi, aggregate);
 			bgp_aggregate_route(bgp, &rn->p, NULL, afi, safi, del,
@@ -5986,13 +5986,13 @@ static int bgp_aggregate_unset(struct vty *vty, const char *prefix_str,
 		return CMD_WARNING_CONFIG_FAILED;
 	}
 
-	aggregate = bgp_aggregate_get_node_info(rn);
+	aggregate = bgp_node_get_bgp_aggregate_info(rn);
 	bgp_aggregate_delete(bgp, &p, afi, safi, aggregate);
 	bgp_aggregate_install(bgp, afi, safi, &p, 0, NULL, NULL,
 			      NULL, NULL,  0, aggregate);
 
 	/* Unlock aggregate address configuration. */
-	bgp_aggregate_set_node_info(rn, NULL);
+	bgp_node_set_bgp_aggregate_info(rn, NULL);
 	bgp_aggregate_free(aggregate);
 	bgp_unlock_node(rn);
 	bgp_unlock_node(rn);
@@ -6043,7 +6043,7 @@ static int bgp_aggregate_set(struct vty *vty, const char *prefix_str, afi_t afi,
 	aggregate->summary_only = summary_only;
 	aggregate->as_set = as_set;
 	aggregate->safi = safi;
-	bgp_aggregate_set_node_info(rn, aggregate);
+	bgp_node_set_bgp_aggregate_info(rn, aggregate);
 
 	/* Aggregate address insert into BGP routing table. */
 	bgp_aggregate_route(bgp, &p, NULL, afi, safi, NULL, aggregate);
@@ -11777,7 +11777,7 @@ void bgp_config_write_network(struct vty *vty, struct bgp *bgp, afi_t afi,
 	/* Aggregate-address configuration. */
 	for (rn = bgp_table_top(bgp->aggregate[afi][safi]); rn;
 	     rn = bgp_route_next(rn)) {
-		bgp_aggregate = bgp_aggregate_get_node_info(rn);
+		bgp_aggregate = bgp_node_get_bgp_aggregate_info(rn);
 		if (bgp_aggregate == NULL)
 			continue;
 
diff --git a/bgpd/bgp_table.h b/bgpd/bgp_table.h
index 77722e515b..1ad5e5e8b2 100644
--- a/bgpd/bgp_table.h
+++ b/bgpd/bgp_table.h
@@ -319,13 +319,14 @@ void bgp_table_range_lookup(const struct bgp_table *table, struct prefix *p,
 
 
 static inline struct bgp_aggregate *
-bgp_aggregate_get_node_info(struct bgp_node *node)
+bgp_node_get_bgp_aggregate_info(struct bgp_node *node)
 {
 	return node->info;
 }
 
-static inline void bgp_aggregate_set_node_info(struct bgp_node *node,
-					       struct bgp_aggregate *aggregate)
+static inline void
+bgp_node_set_bgp_aggregate_info(struct bgp_node *node,
+				struct bgp_aggregate *aggregate)
 {
 	node->info = aggregate;
 }