From: Simon Horman <horms@verge.net.au>
Date: Thu, 23 Feb 2012 23:06:21 +0000 (+0900)
Subject: Make the string parameters const for do_flow_mod__()
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=a7fc17440c2d5ca3963e3b94b16672ad1afd8f12;p=sliver-openvswitch.git

Make the string parameters const for do_flow_mod__()

Make the string parameter of parse_ofp_flow_stats_request_str() and
parse_ofp_flow_mod_str() const

* Both parse_ofp_flow_stats_request_str() and parse_ofp_flow_mod_str()
  only pass their string parameter to it to parse_ofp_str() which treats
  the parameter as const.
* do_flow_mod__() may pass a const string as the string argument to
  parse_ofp_flow_stats_request_str() and parse_ofp_flow_mod_str()

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c
index 24f6876bc..9640a71f8 100644
--- a/lib/ofp-parse.c
+++ b/lib/ofp-parse.c
@@ -668,8 +668,8 @@ parse_ofp_actions(const char *s_, struct ofpbuf *actions)
  * flow. */
 void
 parse_ofp_flow_mod_str(struct list *packets, enum nx_flow_format *cur_format,
-                       bool *flow_mod_table_id, char *string, uint16_t command,
-                       bool verbose)
+                       bool *flow_mod_table_id, const char *string,
+                       uint16_t command, bool verbose)
 {
     enum nx_flow_format min_format, next_format;
     struct cls_rule rule_copy;
@@ -729,7 +729,7 @@ parse_ofp_flow_mod_file(struct list *packets,
 
 void
 parse_ofp_flow_stats_request_str(struct ofputil_flow_stats_request *fsr,
-                                 bool aggregate, char *string)
+                                 bool aggregate, const char *string)
 {
     struct ofputil_flow_mod fm;
 
diff --git a/lib/ofp-parse.h b/lib/ofp-parse.h
index 6eba0dda0..1812a450a 100644
--- a/lib/ofp-parse.h
+++ b/lib/ofp-parse.h
@@ -34,13 +34,13 @@ void parse_ofp_str(struct ofputil_flow_mod *, int command, const char *str_,
 
 void parse_ofp_flow_mod_str(struct list *packets,
                             enum nx_flow_format *cur, bool *flow_mod_table_id,
-                            char *string, uint16_t command, bool verbose);
+                            const char *string, uint16_t command, bool verbose);
 bool parse_ofp_flow_mod_file(struct list *packets,
                              enum nx_flow_format *cur, bool *flow_mod_table_id,
                              FILE *, uint16_t command);
 
 void parse_ofp_flow_stats_request_str(struct ofputil_flow_stats_request *,
-                                      bool aggregate, char *string);
+                                      bool aggregate, const char *string);
 
 
 void parse_ofp_actions(const char *, struct ofpbuf *actions);