mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-25 15:07:05 +00:00
Code Issues Releases Wiki Activity

lib/util: Change is_all_zeros and is_all_ones to take a void *.

Browse Source 
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>
This commit is contained in:
Jarno Rajahalme
2014-09-05 15:44:19 -07:00
parent 6d670e7f0d
commit 53cb9c3edc
4 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/meta-flow.c
View File

@@ -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;
}
}