summaryrefslogtreecommitdiff
path: root/nhrpd/nhrp_cache.c
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2018-06-14 08:58:05 -0400
committerDavid Lamparter <equinox@opensourcerouting.org>2018-08-11 17:14:58 +0200
commit0ce1ca805d607cec2c0f75dac8950f40e75fc971 (patch)
treebf34e7a0084ae76089d43ee7f2c4ca8eeed62c8a /nhrpd/nhrp_cache.c
parent1408cdfc07202b2c3e31ad2ef40fae0e8a31e8c0 (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_cache.c')
-rw-r--r--nhrpd/nhrp_cache.c21
1 files changed, 10 insertions, 11 deletions
diff --git a/nhrpd/nhrp_cache.c b/nhrpd/nhrp_cache.c
index ffc8b5a9bf..f3a33eb28f 100644
--- a/nhrpd/nhrp_cache.c
+++ b/nhrpd/nhrp_cache.c
@@ -48,17 +48,16 @@ static void *nhrp_cache_alloc(void *data)
struct nhrp_cache *p, *key = data;
p = XMALLOC(MTYPE_NHRP_CACHE, sizeof(struct nhrp_cache));
- if (p) {
- *p = (struct nhrp_cache){
- .cur.type = NHRP_CACHE_INVALID,
- .new.type = NHRP_CACHE_INVALID,
- .remote_addr = key->remote_addr,
- .ifp = key->ifp,
- .notifier_list =
- NOTIFIER_LIST_INITIALIZER(&p->notifier_list),
- };
- nhrp_cache_counts[p->cur.type]++;
- }
+
+ *p = (struct nhrp_cache){
+ .cur.type = NHRP_CACHE_INVALID,
+ .new.type = NHRP_CACHE_INVALID,
+ .remote_addr = key->remote_addr,
+ .ifp = key->ifp,
+ .notifier_list =
+ NOTIFIER_LIST_INITIALIZER(&p->notifier_list),
+ };
+ nhrp_cache_counts[p->cur.type]++;
return p;
}