X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Frconn.c;h=67ea86c0e3f17583ec28761a66ff2c09ef9af86a;hb=f31282b9c152d5e993c8fe0068b7a4ed8c8d98c8;hp=002f3676b088a686585e7e232464710929f496a9;hpb=85b20fd6ee585f462e012fbcc7f966a81edab2ed;p=sliver-openvswitch.git diff --git a/lib/rconn.c b/lib/rconn.c index 002f3676b..67ea86c0e 100644 --- a/lib/rconn.c +++ b/lib/rconn.c @@ -16,7 +16,6 @@ #include #include "rconn.h" -#include #include #include #include @@ -293,7 +292,7 @@ void rconn_connect_unreliably(struct rconn *rc, struct vconn *vconn, const char *name) { - assert(vconn != NULL); + ovs_assert(vconn != NULL); rconn_disconnect(rc); rconn_set_target__(rc, vconn_get_name(vconn), name); rc->reliable = false; @@ -469,7 +468,7 @@ run_ACTIVE(struct rconn *rc) rc->name, (unsigned int) (time_now() - base)); version = rconn_get_version(rc); - assert(version >= 0 && version <= 0xff); + ovs_assert(version >= 0 && version <= 0xff); /* Ordering is important here: rconn_send() can transition to BACKOFF, * and we don't want to transition back to IDLE if so, because then we @@ -864,7 +863,7 @@ void rconn_packet_counter_destroy(struct rconn_packet_counter *c) { if (c) { - assert(c->ref_cnt > 0); + ovs_assert(c->ref_cnt > 0); if (!--c->ref_cnt && !c->n_packets) { free(c); } @@ -881,13 +880,13 @@ rconn_packet_counter_inc(struct rconn_packet_counter *c, unsigned int n_bytes) void rconn_packet_counter_dec(struct rconn_packet_counter *c, unsigned int n_bytes) { - assert(c->n_packets > 0); - assert(c->n_bytes >= n_bytes); + ovs_assert(c->n_packets > 0); + ovs_assert(c->n_bytes >= n_bytes); c->n_bytes -= n_bytes; c->n_packets--; if (!c->n_packets) { - assert(!c->n_bytes); + ovs_assert(!c->n_bytes); if (!c->ref_cnt) { free(c); }