diff options
author | Jarno Rajahalme <jrajahalme@nicira.com> | 2014-09-05 15:44:19 -0700 |
---|---|---|
committer | Jarno Rajahalme <jrajahalme@nicira.com> | 2014-09-08 15:01:26 -0700 |
commit | 53cb9c3edc3cc5ec323a1c0b21315e6ded61dadd (patch) | |
tree | a9897aaa50f1595790279f4e1561fd52269bd3df /lib/meta-flow.c | |
parent | 6d670e7f0d45b014d47d1f172c12cf62c4f8bf7f (diff) | |
download | openvswitch-53cb9c3edc3cc5ec323a1c0b21315e6ded61dadd.tar.gz |
lib/util: Change is_all_zeros and is_all_ones to take a void *.
is_all_zeros() and is_all_ones() operate on bytes, but just like with
memset, it is easier to use if the first argument is a void *.
Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'lib/meta-flow.c')
-rw-r--r-- | lib/meta-flow.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/meta-flow.c b/lib/meta-flow.c index b76c11d2c..3b82e62dd 100644 --- a/lib/meta-flow.c +++ b/lib/meta-flow.c @@ -1057,8 +1057,8 @@ mf_is_mask_valid(const struct mf_field *mf, const union mf_value *mask) { switch (mf->maskable) { case MFM_NONE: - return (is_all_zeros((const uint8_t *) mask, mf->n_bytes) || - is_all_ones((const uint8_t *) mask, mf->n_bytes)); + return (is_all_zeros(mask, mf->n_bytes) || + is_all_ones(mask, mf->n_bytes)); case MFM_FULLY: return true; @@ -1904,7 +1904,7 @@ mf_is_zero(const struct mf_field *mf, const struct flow *flow) union mf_value value; mf_get_value(mf, flow, &value); - return is_all_zeros((const uint8_t *) &value, mf->n_bytes); + return is_all_zeros(&value, mf->n_bytes); } /* Makes 'match' wildcard field 'mf'. @@ -2130,10 +2130,10 @@ mf_set(const struct mf_field *mf, const union mf_value *value, const union mf_value *mask, struct match *match) { - if (!mask || is_all_ones((const uint8_t *) mask, mf->n_bytes)) { + if (!mask || is_all_ones(mask, mf->n_bytes)) { mf_set_value(mf, value, match); return mf->usable_protocols; - } else if (is_all_zeros((const uint8_t *) mask, mf->n_bytes)) { + } else if (is_all_zeros(mask, mf->n_bytes)) { mf_set_wild(mf, match); return OFPUTIL_P_ANY; } @@ -2861,10 +2861,10 @@ mf_format(const struct mf_field *mf, struct ds *s) { if (mask) { - if (is_all_zeros((const uint8_t *) mask, mf->n_bytes)) { + if (is_all_zeros(mask, mf->n_bytes)) { ds_put_cstr(s, "ANY"); return; - } else if (is_all_ones((const uint8_t *) mask, mf->n_bytes)) { + } else if (is_all_ones(mask, mf->n_bytes)) { mask = NULL; } } |