Commit 2e507a74 authored by Ondrej Zajicek (work)'s avatar Ondrej Zajicek (work)
Browse files

Use non-fatal asserts even for regular build

parent 72163bd5

lib/birdlib.h

+2 −2
Original line number Diff line number Diff line
@@ -152,9 +152,9 @@ void debug(const char *msg, ...); /* Printf to debug output */ 
#endif



#ifdef DEBUGGING

#define ASSERT(x) do { if (!(x)) bug("Assertion `%s' failed at %s:%d", #x, __FILE__, __LINE__); } while(0)

#define ASSERT(x) do { if (!(x)) bug("Assertion '%s' failed at %s:%d", #x, __FILE__, __LINE__); } while(0)

#else

#define ASSERT(x) do { } while(0)

#define ASSERT(x) do { if (!(x)) log(L_BUG "Assertion '%s' failed at %s:%d", #x, __FILE__, __LINE__); } while(0)

#endif



/* Pseudorandom numbers */

nest/proto.c

+1 −1
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ static void 
channel_request_reload(struct channel *c)

{

  ASSERT(c->channel_state == CS_UP);

  // ASSERT(channel_reloadable(c));

  ASSERT(channel_reloadable(c));



  c->proto->reload_routes(c);

proto/rpki/ssh_transport.c

+0 −2
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ rpki_tr_ssh_open(struct rpki_tr_sock *tr) 
static const char *

rpki_tr_ssh_ident(struct rpki_tr_sock *tr)

{

  ASSERT(tr != NULL);



  struct rpki_cache *cache = tr->cache;

  struct rpki_config *cf = (void *) cache->p->p.cf;

  struct rpki_tr_ssh_config *ssh_cf = (void *) cf->tr_config.spec;

proto/rpki/tcp_transport.c

+0 −2
Original line number Diff line number Diff line
@@ -37,8 +37,6 @@ rpki_tr_tcp_open(struct rpki_tr_sock *tr) 
static const char *

rpki_tr_tcp_ident(struct rpki_tr_sock *tr)

{

  ASSERT(tr != NULL);



  struct rpki_cache *cache = tr->cache;

  struct rpki_config *cf = (void *) cache->p->p.cf;

CRA Git | Maintained and supported by SUSTech CRA and CCSE