diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-06-14 08:58:05 -0400 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2018-08-11 17:14:58 +0200 |
| commit | 0ce1ca805d607cec2c0f75dac8950f40e75fc971 (patch) | |
| tree | bf34e7a0084ae76089d43ee7f2c4ca8eeed62c8a /nhrpd/nhrp_vc.c | |
| parent | 1408cdfc07202b2c3e31ad2ef40fae0e8a31e8c0 (diff) | |
*: ALLOC calls cannot fail
There is no need to check for failure of a ALLOC call
as that any failure to do so will result in a assert
happening. So we can safely remove all of this code.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'nhrpd/nhrp_vc.c')
| -rw-r--r-- | nhrpd/nhrp_vc.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/nhrpd/nhrp_vc.c b/nhrpd/nhrp_vc.c index c373411d66..41a87d4adb 100644 --- a/nhrpd/nhrp_vc.c +++ b/nhrpd/nhrp_vc.c @@ -48,14 +48,13 @@ static void *nhrp_vc_alloc(void *data) struct nhrp_vc *vc, *key = data; vc = XMALLOC(MTYPE_NHRP_VC, sizeof(struct nhrp_vc)); - if (vc) { - *vc = (struct nhrp_vc){ - .local.nbma = key->local.nbma, - .remote.nbma = key->remote.nbma, - .notifier_list = - NOTIFIER_LIST_INITIALIZER(&vc->notifier_list), - }; - } + + *vc = (struct nhrp_vc){ + .local.nbma = key->local.nbma, + .remote.nbma = key->remote.nbma, + .notifier_list = + NOTIFIER_LIST_INITIALIZER(&vc->notifier_list), + }; return vc; } @@ -118,8 +117,6 @@ int nhrp_vc_ipsec_updown(uint32_t child_id, struct nhrp_vc *vc) return 0; sa = XMALLOC(MTYPE_NHRP_VC, sizeof(struct child_sa)); - if (!sa) - return 0; *sa = (struct child_sa){ .id = child_id, |