From f1db813dbbe6e4668bc5d3d4cb1506de7b36fabe Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Tue, 16 Feb 2021 00:46:48 +0100 Subject: [PATCH] *: fix format string SNAFUs Signed-off-by: David Lamparter --- bfdd/dplane.c | 4 ++-- lib/link_state.c | 7 ++++--- ospfd/ospf_lsa.c | 5 ++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bfdd/dplane.c b/bfdd/dplane.c index b8f0aadd93..66b79f3b13 100644 --- a/bfdd/dplane.c +++ b/bfdd/dplane.c @@ -169,8 +169,8 @@ static void bfd_dplane_debug_message(const struct bfddp_message *msg) &msg->data.session.dst); else snprintfrr(addrs, sizeof(addrs), "src=%pI4 dst=%pI4", - &msg->data.session.src, - &msg->data.session.dst); + (struct in_addr *)&msg->data.session.src, + (struct in_addr *)&msg->data.session.dst); buf[0] = 0; if (flags & SESSION_CBIT) diff --git a/lib/link_state.c b/lib/link_state.c index 6bd7ef703c..ecf0d0698d 100644 --- a/lib/link_state.c +++ b/lib/link_state.c @@ -1246,7 +1246,7 @@ void ls_dump_ted(struct ls_ted *ted) for (ALL_LIST_ELEMENTS_RO(vertex->incoming_edges, lst_node, vertex_edge)) { 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->attributes->adv.id.ip.addr, &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, vertex_edge)) { 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->attributes->adv.id.ip.addr, &vertex_edge->attributes->standard.local, @@ -1264,7 +1264,8 @@ void ls_dump_ted(struct ls_ted *ted) } frr_each(edges, &ted->edges, 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 : "no_source", edge->destination ? edge->destination->node->name diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c index 5a48eebe49..6bde5467b2 100644 --- a/ospfd/ospf_lsa.c +++ b/ospfd/ospf_lsa.c @@ -2248,10 +2248,9 @@ void ospf_external_lsa_refresh_type(struct ospf *ospf, uint8_t type, lsa, EXTNL_LSA_AGGR)) zlog_debug( - "%s: Send Aggreate LSA (%pFX/%d)", + "%s: Send Aggreate LSA (%pFX)", __func__, - &aggr->p.prefix, - aggr->p.prefixlen); + &aggr->p); ospf_originate_summary_lsa( ospf, aggr, ei); -- 2.39.5