bgpd: Rename various variable names to something more appropriate

ri -> pi
bi -> bpi
info -> path
info -> rmap_path ( for routemap applications )

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

1 files changed, 10 insertions, 10 deletions

diff --git a/bgpd/bgp_dump.c b/bgpd/bgp_dump.c
index 689b174013..3d1880ca48 100644
--- a/bgpd/bgp_dump.c
+++ b/bgpd/bgp_dump.c
@@ -301,7 +301,7 @@ static void bgp_dump_routes_index_table(struct bgp *bgp)
 
 static struct bgp_path_info *
 bgp_dump_route_node_record(int afi, struct bgp_node *rn,
-			   struct bgp_path_info *info, unsigned int seq)
+			   struct bgp_path_info *path, unsigned int seq)
 {
 	struct stream *obuf;
 	size_t sizep;
@@ -349,18 +349,18 @@ bgp_dump_route_node_record(int afi, struct bgp_node *rn,
 	stream_putw(obuf, 0);
 
 	endp = stream_get_endp(obuf);
-	for (; info; info = info->next) {
+	for (; path; path = path->next) {
 		size_t cur_endp;
 
 		/* Peer index */
-		stream_putw(obuf, info->peer->table_dump_index);
+		stream_putw(obuf, path->peer->table_dump_index);
 
 		/* Originated */
-		stream_putl(obuf, time(NULL) - (bgp_clock() - info->uptime));
+		stream_putl(obuf, time(NULL) - (bgp_clock() - path->uptime));
 
 		/* Dump attribute. */
 		/* Skip prefix & AFI/SAFI for MP_NLRI */
-		bgp_dump_routes_attr(obuf, info->attr, &rn->p);
+		bgp_dump_routes_attr(obuf, path->attr, &rn->p);
 
 		cur_endp = stream_get_endp(obuf);
 		if (cur_endp > BGP_MAX_PACKET_SIZE + BGP_DUMP_MSG_HEADER
@@ -379,7 +379,7 @@ bgp_dump_route_node_record(int afi, struct bgp_node *rn,
 	bgp_dump_set_size(obuf, MSG_TABLE_DUMP_V2);
 	fwrite(STREAM_DATA(obuf), stream_get_endp(obuf), 1, bgp_dump_routes.fp);
 
-	return info;
+	return path;
 }
 
 
@@ -387,7 +387,7 @@ bgp_dump_route_node_record(int afi, struct bgp_node *rn,
 static unsigned int bgp_dump_routes_func(int afi, int first_run,
 					 unsigned int seq)
 {
-	struct bgp_path_info *info;
+	struct bgp_path_info *path;
 	struct bgp_node *rn;
 	struct bgp *bgp;
 	struct bgp_table *table;
@@ -410,9 +410,9 @@ static unsigned int bgp_dump_routes_func(int afi, int first_run,
 	table = bgp->rib[afi][SAFI_UNICAST];
 
 	for (rn = bgp_table_top(table); rn; rn = bgp_route_next(rn)) {
-		info = rn->info;
-		while (info) {
-			info = bgp_dump_route_node_record(afi, rn, info, seq);
+		path = rn->info;
+		while (path) {
+			path = bgp_dump_route_node_record(afi, rn, path, seq);
 			seq++;
 		}
 	}