proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-17 04:15:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8093 from opensourcerouting/format-strings-20210216

Browse Source 
*: fix format string SNAFUs
This commit is contained in:
Russ White 2021-02-16 07:46:40 -05:00 committed by GitHub
commit f37a846db5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bfdd/dplane.c
View File

@ -169,8 +169,8 @@ static void bfd_dplane_debug_message(const struct bfddp_message *msg)
&msg->data.session.dst); &msg->data.session.dst);
else else
snprintfrr(addrs, sizeof(addrs), "src=%pI4 dst=%pI4", snprintfrr(addrs, sizeof(addrs), "src=%pI4 dst=%pI4",
&msg->data.session.src, (struct in_addr *)&msg->data.session.src,
&msg->data.session.dst); (struct in_addr *)&msg->data.session.dst);
buf[0] = 0; buf[0] = 0;
if (flags & SESSION_CBIT) if (flags & SESSION_CBIT)

7
lib/link_state.c
View File

@ -1246,7 +1246,7 @@ void ls_dump_ted(struct ls_ted *ted)
for (ALL_LIST_ELEMENTS_RO(vertex->incoming_edges, lst_node, for (ALL_LIST_ELEMENTS_RO(vertex->incoming_edges, lst_node,
vertex_edge)) { vertex_edge)) {
zlog_debug( zlog_debug(
" inc edge key:%lldn attr key:%pI4 loc:(%pI4) rmt:(%pI4)", " inc edge key:%"PRIu64"n attr key:%pI4 loc:(%pI4) rmt:(%pI4)",
vertex_edge->key, vertex_edge->key,
&vertex_edge->attributes->adv.id.ip.addr, &vertex_edge->attributes->adv.id.ip.addr,
&vertex_edge->attributes->standard.local, &vertex_edge->attributes->standard.local,
@ -1255,7 +1255,7 @@ void ls_dump_ted(struct ls_ted *ted)
for (ALL_LIST_ELEMENTS_RO(vertex->outgoing_edges, lst_node, for (ALL_LIST_ELEMENTS_RO(vertex->outgoing_edges, lst_node,
vertex_edge)) { vertex_edge)) {
zlog_debug( zlog_debug(
" out edge key:%lld attr key:%pI4 loc:(%pI4) rmt:(%pI4)", " out edge key:%"PRIu64" attr key:%pI4 loc:(%pI4) rmt:(%pI4)",
vertex_edge->key, vertex_edge->key,
&vertex_edge->attributes->adv.id.ip.addr, &vertex_edge->attributes->adv.id.ip.addr,
&vertex_edge->attributes->standard.local, &vertex_edge->attributes->standard.local,
@ -1264,7 +1264,8 @@ void ls_dump_ted(struct ls_ted *ted)
} }
frr_each(edges, &ted->edges, edge) { frr_each(edges, &ted->edges, edge) {
ls_edge2msg(&msg, edge); ls_edge2msg(&msg, edge);
zlog_debug(" Ted edge key:%lld src:%s dst:%s", edge->key, zlog_debug(" Ted edge key:%"PRIu64" src:%s dst:%s",
edge->key,
edge->source ? edge->source->node->name edge->source ? edge->source->node->name
: "no_source", : "no_source",
edge->destination ? edge->destination->node->name edge->destination ? edge->destination->node->name

5
ospfd/ospf_lsa.c
View File

@ -2248,10 +2248,9 @@ void ospf_external_lsa_refresh_type(struct ospf *ospf, uint8_t type,
lsa, lsa,
EXTNL_LSA_AGGR)) EXTNL_LSA_AGGR))
zlog_debug( zlog_debug(
"%s: Send Aggreate LSA (%pFX/%d)", "%s: Send Aggreate LSA (%pFX)",
__func__, __func__,
&aggr->p.prefix, &aggr->p);
aggr->p.prefixlen);
ospf_originate_summary_lsa( ospf_originate_summary_lsa(
ospf, aggr, ei); ospf, aggr, ei);