From 31107a358a8ba38491507a8edc76dd7e1657449e Mon Sep 17 00:00:00 2001
From: Lou Berger <lberger@labn.net>
Date: Wed, 5 Oct 2016 20:44:57 -0400
Subject: [PATCH] rfapi: cleanup some warnings

---
 bgpd/rfapi/rfapi.c     | 7 -------
 bgpd/rfapi/rfapi_rib.c | 4 ++--
 bgpd/rfapi/rfapi_vty.c | 2 +-
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/bgpd/rfapi/rfapi.c b/bgpd/rfapi/rfapi.c
index 8ff95e9ad3..0cf3bdfb57 100644
--- a/bgpd/rfapi/rfapi.c
+++ b/bgpd/rfapi/rfapi.c
@@ -3191,14 +3191,7 @@ DEFUN (debug_rfapi_close_rfd,
   int rc;
   char *endptr = NULL;
 
-#if (UINTPTR_MAX == ULONG_MAX)
-  handle = (void *) (uintptr_t) (strtoul (argv[0], &endptr, 16));
-#elif (UINTPTR_MAX == ULLONG_MAX)
   handle = (rfapi_handle) (uintptr_t) (strtoull (argv[0], &endptr, 16));
-#else
-  /* give up */
-  assert (0);
-#endif
 
   if (*endptr != '\0' || (uintptr_t) handle == UINTPTR_MAX)
     {
diff --git a/bgpd/rfapi/rfapi_rib.c b/bgpd/rfapi/rfapi_rib.c
index 62ffd7b820..896b5f50a8 100644
--- a/bgpd/rfapi/rfapi_rib.c
+++ b/bgpd/rfapi/rfapi_rib.c
@@ -1013,8 +1013,8 @@ process_pending_node (
 
   zlog_debug ("%s:   lPendCost->count=%d, slRibPt->count=%d",
               __func__,
-              (lPendCost ? lPendCost->count : -1),
-              (slRibPt ? slRibPt->count : -1));
+              (lPendCost ? (int) lPendCost->count : -1),
+              (slRibPt ? (int) slRibPt->count : -1));
 
   /*
    * Iterate over routes at RIB Node.
diff --git a/bgpd/rfapi/rfapi_vty.c b/bgpd/rfapi/rfapi_vty.c
index 3c76bb4223..90c0e63a7a 100644
--- a/bgpd/rfapi/rfapi_vty.c
+++ b/bgpd/rfapi/rfapi_vty.c
@@ -566,7 +566,7 @@ rfapiPrintBi (void *stream, struct bgp_info *bi)
   int has_macaddr = 0;
   struct ethaddr macaddr;
   struct rfapi_l2address_option l2o_buf;
-  uint8_t l2hid;                /* valid if has_macaddr */
+  uint8_t l2hid=0;                /* valid if has_macaddr */
 
 #define REMAIN (BUFSIZ - (p-line))
 #define INCP {p += (r > REMAIN)? REMAIN: r;}