rfapi: cleanup some warnings

This commit is contained in:
Lou Berger 2016-10-05 20:44:57 -04:00 committed by Donald Sharp
parent 608ef8c72d
commit 31107a358a
3 changed files with 3 additions and 10 deletions

View File

@ -3191,14 +3191,7 @@ DEFUN (debug_rfapi_close_rfd,
int rc; int rc;
char *endptr = NULL; 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)); handle = (rfapi_handle) (uintptr_t) (strtoull (argv[0], &endptr, 16));
#else
/* give up */
assert (0);
#endif
if (*endptr != '\0' || (uintptr_t) handle == UINTPTR_MAX) if (*endptr != '\0' || (uintptr_t) handle == UINTPTR_MAX)
{ {

View File

@ -1013,8 +1013,8 @@ process_pending_node (
zlog_debug ("%s: lPendCost->count=%d, slRibPt->count=%d", zlog_debug ("%s: lPendCost->count=%d, slRibPt->count=%d",
__func__, __func__,
(lPendCost ? lPendCost->count : -1), (lPendCost ? (int) lPendCost->count : -1),
(slRibPt ? slRibPt->count : -1)); (slRibPt ? (int) slRibPt->count : -1));
/* /*
* Iterate over routes at RIB Node. * Iterate over routes at RIB Node.

View File

@ -566,7 +566,7 @@ rfapiPrintBi (void *stream, struct bgp_info *bi)
int has_macaddr = 0; int has_macaddr = 0;
struct ethaddr macaddr; struct ethaddr macaddr;
struct rfapi_l2address_option l2o_buf; 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 REMAIN (BUFSIZ - (p-line))
#define INCP {p += (r > REMAIN)? REMAIN: r;} #define INCP {p += (r > REMAIN)? REMAIN: r;}