From 642ac49da40a196c4e4ad74128de2056237d3cb4 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Fri, 23 Apr 2021 11:25:44 +0200 Subject: [PATCH] *: remaining zassert => assert Signed-off-by: David Lamparter --- lib/thread.c | 2 +- nhrpd/nhrp_cache.c | 2 +- nhrpd/zbuf.c | 2 +- pbrd/pbr_zebra.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/thread.c b/lib/thread.c index 3d8b54467..26619af6c 100644 --- a/lib/thread.c +++ b/lib/thread.c @@ -664,7 +664,7 @@ static int time_hhmmss(char *buf, int buf_size, long sec) long mm; int wr; - zassert(buf_size >= 8); + assert(buf_size >= 8); hh = sec / 3600; sec %= 3600; diff --git a/nhrpd/nhrp_cache.c b/nhrpd/nhrp_cache.c index bcf0e2168..c358baecb 100644 --- a/nhrpd/nhrp_cache.c +++ b/nhrpd/nhrp_cache.c @@ -72,7 +72,7 @@ static void nhrp_cache_free(struct nhrp_cache *c) debugf(NHRP_DEBUG_COMMON, "Deleting cache entry"); nhrp_cache_counts[c->cur.type]--; notifier_call(&c->notifier_list, NOTIFY_CACHE_DELETE); - zassert(!notifier_active(&c->notifier_list)); + assert(!notifier_active(&c->notifier_list)); hash_release(nifp->cache_hash, c); THREAD_OFF(c->t_timeout); THREAD_OFF(c->t_auth); diff --git a/nhrpd/zbuf.c b/nhrpd/zbuf.c index e3d9d042c..e191a90f2 100644 --- a/nhrpd/zbuf.c +++ b/nhrpd/zbuf.c @@ -59,7 +59,7 @@ void zbuf_reset(struct zbuf *zb) void zbuf_reset_head(struct zbuf *zb, void *ptr) { - zassert((void *)zb->buf <= ptr && ptr <= (void *)zb->tail); + assert((void *)zb->buf <= ptr && ptr <= (void *)zb->tail); zb->head = ptr; } diff --git a/pbrd/pbr_zebra.c b/pbrd/pbr_zebra.c index 4b73e13c2..eb41bf604 100644 --- a/pbrd/pbr_zebra.c +++ b/pbrd/pbr_zebra.c @@ -50,8 +50,8 @@ struct pbr_interface *pbr_if_new(struct interface *ifp) { struct pbr_interface *pbr_ifp; - zassert(ifp); - zassert(!ifp->info); + assert(ifp); + assert(!ifp->info); pbr_ifp = XCALLOC(MTYPE_PBR_INTERFACE, sizeof(*pbr_ifp)); -- 2.39.5