X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fofpbuf.c;h=6484ab3b86d534b630c8c2becea303cea7fa8676;hb=eb857b4824d2a62e1cc1b85c30a3da007d4942c9;hp=a7d4c734181763e5134175d59defb8c69d658989;hpb=ebc56baa41db060b8783051e67b6fcbc148ebd60;p=sliver-openvswitch.git diff --git a/lib/ofpbuf.c b/lib/ofpbuf.c index a7d4c7341..6484ab3b8 100644 --- a/lib/ofpbuf.c +++ b/lib/ofpbuf.c @@ -16,7 +16,6 @@ #include #include "ofpbuf.h" -#include #include #include #include "dynamic-string.h" @@ -421,7 +420,7 @@ ofpbuf_put_hex(struct ofpbuf *b, const char *s, size_t *n) void ofpbuf_reserve(struct ofpbuf *b, size_t size) { - assert(!b->size); + ovs_assert(!b->size); ofpbuf_prealloc_tailroom(b, size); b->data = (char*)b->data + size; } @@ -473,7 +472,7 @@ ofpbuf_at(const struct ofpbuf *b, size_t offset, size_t size) void * ofpbuf_at_assert(const struct ofpbuf *b, size_t offset, size_t size) { - assert(offset + size <= b->size); + ovs_assert(offset + size <= b->size); return ((char *) b->data) + offset; } @@ -506,7 +505,7 @@ void * ofpbuf_pull(struct ofpbuf *b, size_t size) { void *data = b->data; - assert(b->size >= size); + ovs_assert(b->size >= size); b->data = (char*)b->data + size; b->size -= size; return data;