Rename cls_rule_zero_wildcards() to cls_rule_zero_wildcarded_fields().

Justin said that he found the shorter name confusing.

diff --git a/lib/classifier.c b/lib/classifier.c
index 42f026ff9d859b15766edd9e1293d6bdfeb0dc1c..3e0e2150d60c20d412e9ff453b83c98dc39c2d3a 100644 (file)
--- 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 e178703c6f961e1dd4d49c059367966e31d56933..64f5e31b81d17bd73216509a2b88604807626656 100644 (file)
--- 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 *);