diff options
| -rw-r--r-- | bgpd/bgp_updgrp_adv.c | 2 | ||||
| -rw-r--r-- | pimd/pim_igmp_mtrace.c | 5 | ||||
| -rw-r--r-- | tests/bgpd/test_mpath.c | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/bgpd/bgp_updgrp_adv.c b/bgpd/bgp_updgrp_adv.c index 6399bc93aa..b460690849 100644 --- a/bgpd/bgp_updgrp_adv.c +++ b/bgpd/bgp_updgrp_adv.c @@ -316,7 +316,7 @@ static int subgroup_coalesce_timer(struct thread *thread) zlog_debug("u%" PRIu64 ":s%" PRIu64 " announcing routes upon coalesce timer expiry(%u ms)", (SUBGRP_UPDGRP(subgrp))->id, subgrp->id, - subgrp->v_coalesce), + subgrp->v_coalesce); subgrp->t_coalesce = NULL; subgrp->v_coalesce = 0; subgroup_announce_route(subgrp); diff --git a/pimd/pim_igmp_mtrace.c b/pimd/pim_igmp_mtrace.c index 1cecd976cd..cac6fab271 100644 --- a/pimd/pim_igmp_mtrace.c +++ b/pimd/pim_igmp_mtrace.c @@ -271,11 +271,10 @@ static uint32_t query_arrival_time(void) struct timeval tv; uint32_t qat; - char m_qat[] = "Query arrival time lookup failed: errno=%d: %s"; - if (gettimeofday(&tv, NULL) < 0) { if (PIM_DEBUG_MTRACE) - zlog_warn(m_qat, errno, safe_strerror(errno)); + zlog_warn("Query arrival time lookup failed: errno=%d: %s", + errno, safe_strerror(errno)); return 0; } /* not sure second offset correct, as I get different value */ diff --git a/tests/bgpd/test_mpath.c b/tests/bgpd/test_mpath.c index 2258df9491..87c214969f 100644 --- a/tests/bgpd/test_mpath.c +++ b/tests/bgpd/test_mpath.c @@ -315,7 +315,7 @@ static int setup_bgp_path_info_mpath_update(testcase_t *t) str2prefix("42.1.1.0/24", &test_rn.p); rt_node = bgp_node_to_rnode(&test_rn); memcpy((struct route_table *)&rt_node->table, &rt->route_table, - sizeof(struct route_table)); + sizeof(struct route_table *)); setup_bgp_mp_list(t); for (i = 0; i < test_mp_list_info_count; i++) bgp_path_info_add(&test_rn, &test_mp_list_info[i]); |