diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-02-08 09:35:57 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-02-08 09:35:57 -0500 |
| commit | ce45c9cc64360113f162dfed9923f7f02e5684e7 (patch) | |
| tree | 14b3cf139775d0ff8ba7cdd16db3b316c2d8e804 | |
| parent | 74ef1672285135d630356054eba5491cdbaa5186 (diff) | |
| parent | e84aba82ab3ab5192eecaa4a210bf1fcf7aaceda (diff) | |
Merge branch 'master' of https://github.com/freerangerouting/frr into coverity
| -rw-r--r-- | lib/routemap.c | 6 | ||||
| -rw-r--r-- | tests/bgp_mp_attr_test.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/routemap.c b/lib/routemap.c index 7be24dfda4..49b3039838 100644 --- a/lib/routemap.c +++ b/lib/routemap.c @@ -2303,9 +2303,9 @@ DEFUN (no_match_metric, if (argc <= idx_number) return rmap_match_set_hook.no_match_metric (vty, index, "metric", NULL, RMAP_EVENT_MATCH_DELETED); - return rmap_match_set_hook.no_match_metric(vty, index, "metric", - argv[idx_number]->arg, - RMAP_EVENT_MATCH_DELETED); + return rmap_match_set_hook.no_match_metric(vty, index, "metric", + argv[idx_number]->arg, + RMAP_EVENT_MATCH_DELETED); } return CMD_SUCCESS; } diff --git a/tests/bgp_mp_attr_test.c b/tests/bgp_mp_attr_test.c index f7c2af4405..397612c315 100644 --- a/tests/bgp_mp_attr_test.c +++ b/tests/bgp_mp_attr_test.c @@ -709,7 +709,7 @@ parse_test (struct peer *peer, struct test_segment *t, int type) parse_ret = bgp_mp_unreach_parse (&attr_args, &nlri); if (!parse_ret) { - afi_t pkt_afi; + iana_afi_t pkt_afi; safi_t pkt_safi; /* Convert AFI, SAFI to internal values, check. */ |