*: remaining zassert => assert

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

diff --git a/lib/thread.c b/lib/thread.c
index 3d8b54467821f05229a47a7525ed4435512ac90e..26619af6c83c2e1fcb5ae6cad611c431892a16cf 100644 (file)
--- 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 bcf0e2168c9275683ac14a4e3f3bc9fe11283213..c358baecb27c3fb1c7f51d5594bd7e1554960629 100644 (file)
--- 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 e3d9d042c5790246e0e8cc7af43ddd7c7d2d4e3c..e191a90f2d8c0bd2cdf1643f09c5d3b7753a3660 100644 (file)
--- 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 4b73e13c27f463b8da96f03ebdab2575e2a95c5d..eb41bf604365975965c218b1ee2344810599549b 100644 (file)
--- 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));