git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace most uses of assert by ovs_assert.
[sliver-openvswitch.git]
/
lib
/
nx-match.c
diff --git
a/lib/nx-match.c
b/lib/nx-match.c
index
ecaab05
..
4d7fcd6
100644
(file)
--- a/
lib/nx-match.c
+++ b/
lib/nx-match.c
@@
-121,7
+121,7
@@
nx_pull_raw(const uint8_t *p, unsigned int match_len, bool strict,
{
uint32_t header;
{
uint32_t header;
- assert((cookie != NULL) == (cookie_mask != NULL));
+
ovs_
assert((cookie != NULL) == (cookie_mask != NULL));
match_init_catchall(match);
if (cookie) {
match_init_catchall(match);
if (cookie) {
@@
-1053,7
+1053,7
@@
set_field_format(const struct ofpact_reg_load *load, struct ds *s)
const struct mf_field *mf = load->dst.field;
union mf_value value;
const struct mf_field *mf = load->dst.field;
union mf_value value;
- assert(load->ofpact.compat == OFPUTIL_OFPAT12_SET_FIELD);
+
ovs_
assert(load->ofpact.compat == OFPUTIL_OFPAT12_SET_FIELD);
ds_put_format(s, "set_field:");
memset(&value, 0, sizeof value);
bitwise_copy(&load->subvalue, sizeof load->subvalue, 0,
ds_put_format(s, "set_field:");
memset(&value, 0, sizeof value);
bitwise_copy(&load->subvalue, sizeof load->subvalue, 0,