diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-08-21 03:07:33 +0200 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-09-06 22:50:58 +0200 |
| commit | 1dd58cc81166c93069f2bfb477ae014814dc4286 (patch) | |
| tree | 70ef8bdad6d8488393cdc0830afd57aa6d894759 /ospfd/ospf_ri.c | |
| parent | ospfd: Convert opsfd.c to use new error-code subysstem (diff) | |
| download | frr-1dd58cc81166c93069f2bfb477ae014814dc4286.tar.xz frr-1dd58cc81166c93069f2bfb477ae014814dc4286.zip | |
ospfd: Modify ospf_ri.c to use new error-code subsystem
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'ospfd/ospf_ri.c')
| -rw-r--r-- | ospfd/ospf_ri.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/ospfd/ospf_ri.c b/ospfd/ospf_ri.c index c5e0cd387..2c813c307 100644 --- a/ospfd/ospf_ri.c +++ b/ospfd/ospf_ri.c @@ -201,8 +201,7 @@ static int ospf_router_info_unregister() if ((OspfRI.scope != OSPF_OPAQUE_AS_LSA) && (OspfRI.scope != OSPF_OPAQUE_AREA_LSA)) { - zlog_warn( - "Unable to unregister Router Info functions: Wrong scope!"); + assert("Unable to unregister Router Info functions: Wrong scope!" == NULL); return -1; } @@ -813,11 +812,7 @@ static int ospf_router_info_lsa_originate1(void *arg) } /* Create new Opaque-LSA/ROUTER INFORMATION instance. */ - if ((new = ospf_router_info_lsa_new()) == NULL) { - zlog_warn( - "ospf_router_info_lsa_originate1: ospf_router_info_lsa_new() ?"); - return rc; - } + new = ospf_router_info_lsa_new(); new->vrf_id = vrf_id; /* Get ospf info */ @@ -924,11 +919,7 @@ static struct ospf_lsa *ospf_router_info_lsa_refresh(struct ospf_lsa *lsa) } /* Create new Opaque-LSA/ROUTER INFORMATION instance. */ - if ((new = ospf_router_info_lsa_new()) == NULL) { - zlog_warn( - "ospf_router_info_lsa_refresh: ospf_router_info_lsa_new() ?"); - return NULL; - } + new = ospf_router_info_lsa_new(); new->data->ls_seqnum = lsa_seqnum_increment(lsa); new->vrf_id = lsa->vrf_id; |