diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2020-11-10 17:23:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-10 17:23:02 +0100 |
| commit | 42e122614b926405783e3e2c427f63d64ea36706 (patch) | |
| tree | 56a0de50397ea1d45d5e15ebd77d0c27f5aa9439 /ospf6d/ospf6_abr.c | |
| parent | Merge pull request #7445 from ranjanyash54/dev_4 (diff) | |
| parent | * : clean up format specifiers for gcc-10 (diff) | |
| download | frr-42e122614b926405783e3e2c427f63d64ea36706.tar.xz frr-42e122614b926405783e3e2c427f63d64ea36706.zip | |
Merge pull request #7448 from mjstapp/fix_gcc10_formats
* : clean up format specifiers for gcc-10
Diffstat (limited to 'ospf6d/ospf6_abr.c')
| -rw-r--r-- | ospf6d/ospf6_abr.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/ospf6d/ospf6_abr.c b/ospf6d/ospf6_abr.c index f087289df..c71b30a2d 100644 --- a/ospf6d/ospf6_abr.c +++ b/ospf6d/ospf6_abr.c @@ -196,7 +196,7 @@ int ospf6_abr_originate_summary_to_area(struct ospf6_route *route, if (ADV_ROUTER_IN_PREFIX(&route->prefix) == area->ospf6->router_id) { zlog_debug( - "%s: Skipping ASBR announcement for ABR (%pFX)", + "%s: Skipping ASBR announcement for ABR (%pI4)", __func__, &ADV_ROUTER_IN_PREFIX(&route->prefix)); return 0; @@ -208,7 +208,7 @@ int ospf6_abr_originate_summary_to_area(struct ospf6_route *route, || IS_OSPF6_DEBUG_ORIGINATE(INTER_ROUTER)) { is_debug++; zlog_debug( - "Originating summary in area %s for ASBR %pFX", + "Originating summary in area %s for ASBR %pI4", area->name, &ADV_ROUTER_IN_PREFIX(&route->prefix)); } @@ -225,9 +225,7 @@ int ospf6_abr_originate_summary_to_area(struct ospf6_route *route, if (is_debug) zlog_debug( "%s: route %pFX with cost %u is not best, ignore.", - __func__, - &ADV_ROUTER_IN_PREFIX( - &route->prefix), + __func__, &route->prefix, route->path.cost); return 0; } @@ -405,8 +403,7 @@ int ospf6_abr_originate_summary_to_area(struct ospf6_route *route, if (is_debug) zlog_debug( "prefix %pFX was denied by export list", - &ADV_ROUTER_IN_PREFIX( - &route->prefix)); + &route->prefix); return 0; } } @@ -418,7 +415,7 @@ int ospf6_abr_originate_summary_to_area(struct ospf6_route *route, if (is_debug) zlog_debug( "prefix %pFX was denied by filter-list out", - &ADV_ROUTER_IN_PREFIX(&route->prefix)); + &route->prefix); return 0; } |