bgpd: Rename various variable names to something more appropriate

[mirror_frr.git] / bgpd / rfapi / rfapi_import.h

diff --git a/bgpd/rfapi/rfapi_import.h b/bgpd/rfapi/rfapi_import.h
index 69e623e30e18807cc81a97d043ef38064f5288e8..1ab9cc5193fba289aedd196332f6affa14403433 100644 (file)
--- a/bgpd/rfapi/rfapi_import.h
+++ b/bgpd/rfapi/rfapi_import.h
@@ -51,18 +51,18 @@ struct rfapi_import_table {
        int imported_count[AFI_MAX];
 };
 
-#define RFAPI_LOCAL_BI(bi)                                                     \
-       (((bi)->type == ZEBRA_ROUTE_BGP) && ((bi)->sub_type == BGP_ROUTE_RFP))
+#define RFAPI_LOCAL_BI(bpi)                                                    \
+       (((bpi)->type == ZEBRA_ROUTE_BGP) && ((bpi)->sub_type == BGP_ROUTE_RFP))
 
-#define RFAPI_DIRECT_IMPORT_BI(bi)                                             \
-       (((bi)->type == ZEBRA_ROUTE_BGP_DIRECT)                                \
-        || ((bi)->type == ZEBRA_ROUTE_BGP_DIRECT_EXT))
+#define RFAPI_DIRECT_IMPORT_BI(bpi)                                            \
+       (((bpi)->type == ZEBRA_ROUTE_BGP_DIRECT)                               \
+        || ((bpi)->type == ZEBRA_ROUTE_BGP_DIRECT_EXT))
 
-#define RFAPI_UPDATE_ITABLE_COUNT(bi, itable, afi, cnt)                        \
-       if (RFAPI_LOCAL_BI(bi)) {                                              \
+#define RFAPI_UPDATE_ITABLE_COUNT(bpi, itable, afi, cnt)                       \
+       if (RFAPI_LOCAL_BI(bpi)) {                                             \
                (itable)->local_count[(afi)] += (cnt);                         \
        } else {                                                               \
-               if (RFAPI_DIRECT_IMPORT_BI(bi))                                \
+               if (RFAPI_DIRECT_IMPORT_BI(bpi))                               \
                        (itable)->imported_count[(afi)] += (cnt);              \
                else                                                           \
                        (itable)->remote_count[(afi)] += (cnt);                \
@@ -75,9 +75,9 @@ extern void rfapiDebugBacktrace(void);
 extern void rfapiCheckRouteCount(void);
 
 /*
- * Print BI in an Import Table
+ * Print BPI in an Import Table
  */
-extern void rfapiPrintBi(void *stream, struct bgp_path_info *bi);
+extern void rfapiPrintBi(void *stream, struct bgp_path_info *bpi);
 
 extern void rfapiShowImportTable(void *stream, const char *label,
                                 struct agg_table *rt, int isvpn);
@@ -128,7 +128,7 @@ extern int rfapiHasNonRemovedRoutes(struct agg_node *rn);
 
 extern int rfapiProcessDeferredClose(struct thread *t);
 
-extern int rfapiGetUnAddrOfVpnBi(struct bgp_path_info *bi, struct prefix *p);
+extern int rfapiGetUnAddrOfVpnBi(struct bgp_path_info *bpi, struct prefix *p);
 
 extern void rfapiNexthop2Prefix(struct attr *attr, struct prefix *p);