[cleanup] Fix compile warnings
Fix printf format warning and make capability table 'const static'
diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c
index 84d8191..540edad 100644
--- a/bgpd/bgp_open.c
+++ b/bgpd/bgp_open.c
@@ -441,7 +441,7 @@
return as4;
}
-static struct message capcode_str[] =
+static const struct message capcode_str[] =
{
{ CAPABILITY_CODE_MP, "MultiProtocol Extensions" },
{ CAPABILITY_CODE_REFRESH, "Route Refresh" },
@@ -452,10 +452,10 @@
{ CAPABILITY_CODE_REFRESH_OLD, "Route Refresh (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) */
-static size_t cap_minsizes[] =
+static const size_t cap_minsizes[] =
{
[CAPABILITY_CODE_MP] = sizeof (struct capability_mp_data),
[CAPABILITY_CODE_REFRESH] = CAPABILITY_CODE_REFRESH_LEN,
@@ -529,7 +529,8 @@
" expected at least %u",
peer->host,
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);
return -1;
}