[cleanup] Fix compile warnings

Fix printf format warning and make capability table 'const static'
This commit is contained in:
Stephen Hemminger 2009-05-15 09:48:55 -07:00 committed by Paul Jakma
parent 65d3fbb483
commit fc52f95373

View File

@ -441,7 +441,7 @@ bgp_capability_as4 (struct peer *peer, struct capability_header *hdr)
return as4; return as4;
} }
static struct message capcode_str[] = static const struct message capcode_str[] =
{ {
{ CAPABILITY_CODE_MP, "MultiProtocol Extensions" }, { CAPABILITY_CODE_MP, "MultiProtocol Extensions" },
{ CAPABILITY_CODE_REFRESH, "Route Refresh" }, { CAPABILITY_CODE_REFRESH, "Route Refresh" },
@ -452,10 +452,10 @@ static struct message capcode_str[] =
{ CAPABILITY_CODE_REFRESH_OLD, "Route Refresh (Old)" }, { CAPABILITY_CODE_REFRESH_OLD, "Route Refresh (Old)" },
{ CAPABILITY_CODE_ORF_OLD, "ORF (Old)" }, { CAPABILITY_CODE_ORF_OLD, "ORF (Old)" },
}; };
int capcode_str_max = sizeof(capcode_str)/sizeof(capcode_str[0]); static const int capcode_str_max = sizeof(capcode_str)/sizeof(capcode_str[0]);
/* Minimum sizes for length field of each cap (so not inc. the header) */ /* Minimum sizes for length field of each cap (so not inc. the header) */
static size_t cap_minsizes[] = static const size_t cap_minsizes[] =
{ {
[CAPABILITY_CODE_MP] = sizeof (struct capability_mp_data), [CAPABILITY_CODE_MP] = sizeof (struct capability_mp_data),
[CAPABILITY_CODE_REFRESH] = CAPABILITY_CODE_REFRESH_LEN, [CAPABILITY_CODE_REFRESH] = CAPABILITY_CODE_REFRESH_LEN,
@ -529,7 +529,8 @@ bgp_capability_parse (struct peer *peer, size_t length, u_char **error)
" expected at least %u", " expected at least %u",
peer->host, peer->host,
LOOKUP (capcode_str, caphdr.code), LOOKUP (capcode_str, caphdr.code),
caphdr.length, cap_minsizes[caphdr.code]); caphdr.length,
(unsigned) cap_minsizes[caphdr.code]);
bgp_notify_send (peer, BGP_NOTIFY_CEASE, 0); bgp_notify_send (peer, BGP_NOTIFY_CEASE, 0);
return -1; return -1;
} }