From 52ce26ee3b13496f65132996120e59ec29ab64c2 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Mon, 8 Nov 2010 10:36:26 -0800 Subject: [PATCH] Rename cls_rule_zero_wildcards() to cls_rule_zero_wildcarded_fields(). Justin said that he found the shorter name confusing. --- lib/classifier.c | 4 ++-- lib/classifier.h | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/classifier.c b/lib/classifier.c index 42f026ff9..3e0e2150d 100644 --- a/lib/classifier.c +++ b/lib/classifier.c @@ -105,7 +105,7 @@ cls_rule_init__(struct cls_rule *rule, { rule->flow = *flow; flow_wildcards_init(&rule->wc, wildcards); - cls_rule_zero_wildcards(rule); + cls_rule_zero_wildcarded_fields(rule); } /* Converts the flow in 'flow' into a cls_rule in 'rule', with the given @@ -143,7 +143,7 @@ cls_rule_from_match(const struct ofp_match *match, unsigned int priority, * restore the invariant in a cls_rule whose 'wc' member is modified by hand. */ void -cls_rule_zero_wildcards(struct cls_rule *rule) +cls_rule_zero_wildcarded_fields(struct cls_rule *rule) { zero_wildcards(&rule->flow, &rule->wc); } diff --git a/lib/classifier.h b/lib/classifier.h index e178703c6..64f5e31b8 100644 --- a/lib/classifier.h +++ b/lib/classifier.h @@ -55,8 +55,9 @@ struct cls_table { * invariant that the classifier depends on: * * - If a bit or a field is wildcarded in 'wc', then the corresponding bit or - * field in 'flow' is set to all-0-bits. (The cls_rule_zero_wildcards() - * function can be used to restore this invariant after adding wildcards.) + * field in 'flow' is set to all-0-bits. (The + * cls_rule_zero_wildcarded_fields() function can be used to restore this + * invariant after adding wildcards.) */ struct cls_rule { struct hmap_node hmap_node; /* Within struct cls_table 'rules'. */ @@ -77,7 +78,7 @@ void cls_rule_from_flow(const struct flow *, uint32_t wildcards, void cls_rule_from_match(const struct ofp_match *, unsigned int priority, int flow_format, uint64_t cookie, struct cls_rule *); -void cls_rule_zero_wildcards(struct cls_rule *); +void cls_rule_zero_wildcarded_fields(struct cls_rule *); char *cls_rule_to_string(const struct cls_rule *); void cls_rule_print(const struct cls_rule *); -- 2.43.0