diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2022-07-08 21:30:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-08 21:30:54 -0400 |
| commit | 42e172499d2c49f6a98013d35ff7439db6e5520c (patch) | |
| tree | 208da7d3ee8b845a3637f05527bc0074e2c27d99 | |
| parent | 6ea484cf74ac849d169d7107453eb7ab3491e7d0 (diff) | |
| parent | 37e7007373b8dac7e4a31027cf0bff39ae2a67e4 (diff) | |
Merge pull request #11569 from opensourcerouting/gcc-plugin-shortcomings-220708
bgpd: work around GCC/plugin shortcomings
| -rw-r--r-- | bgpd/bgp_updgrp.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/bgpd/bgp_updgrp.c b/bgpd/bgp_updgrp.c index c2b6632643..adde379fb0 100644 --- a/bgpd/bgp_updgrp.c +++ b/bgpd/bgp_updgrp.c @@ -421,10 +421,9 @@ static unsigned int updgrp_hash_key_make(const void *p) if (bgp_debug_neighbor_events(peer)) { zlog_debug( - "%pBP Update Group Hash: sort: %d UpdGrpFlags: %" PRIu64 - " UpdGrpAFFlags: %u", + "%pBP Update Group Hash: sort: %d UpdGrpFlags: %ju UpdGrpAFFlags: %u", peer, peer->sort, - (uint64_t)(peer->flags & PEER_UPDGRP_FLAGS), + (intmax_t)(peer->flags & PEER_UPDGRP_FLAGS), flags & PEER_UPDGRP_AF_FLAGS); zlog_debug( "%pBP Update Group Hash: addpath: %u UpdGrpCapFlag: %u UpdGrpCapAFFlag: %u route_adv: %u change local as: %u", @@ -464,10 +463,8 @@ static unsigned int updgrp_hash_key_make(const void *p) peer->shared_network && peer_afi_active_nego(peer, AFI_IP6)); zlog_debug( - "%pBP Update Group Hash: Lonesoul: %" PRIu64 - " ORF prefix: %u ORF old: %u max prefix out: %u", - peer, - (uint64_t)CHECK_FLAG(peer->flags, PEER_FLAG_LONESOUL), + "%pBP Update Group Hash: Lonesoul: %d ORF prefix: %u ORF old: %u max prefix out: %u", + peer, !!CHECK_FLAG(peer->flags, PEER_FLAG_LONESOUL), CHECK_FLAG(peer->af_cap[afi][safi], PEER_CAP_ORF_PREFIX_SM_RCV), CHECK_FLAG(peer->af_cap[afi][safi], |