From: Ben Pfaff <blp@nicira.com>
Date: Thu, 24 Jan 2013 21:56:10 +0000 (-0800)
Subject: ofp-util: Rename ofputil_port_from_string() variable to avoid hiding param.
X-Git-Tag: sliver-openvswitch-1.10.90-1~11^2~96
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a6b112a8b31fdf56a73cb539c0ab41672fc71712;p=sliver-openvswitch.git

ofp-util: Rename ofputil_port_from_string() variable to avoid hiding param.

This function has a parameter 's' and a local variable 's', so rename the
local variable to reduce confusion.

Found by Coverity.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
---

diff --git a/lib/ofp-util.c b/lib/ofp-util.c
index c66cd4007..40983504e 100644
--- a/lib/ofp-util.c
+++ b/lib/ofp-util.c
@@ -4115,14 +4115,14 @@ ofputil_port_from_string(const char *s, uint16_t *portp)
             *portp = port32;
             return true;
         } else if (port32 <= OFPP_LAST_RESV) {
-            struct ds s;
+            struct ds msg;
 
-            ds_init(&s);
-            ofputil_format_port(port32, &s);
+            ds_init(&msg);
+            ofputil_format_port(port32, &msg);
             VLOG_WARN_ONCE("referring to port %s as %u is deprecated for "
                            "compatibility with future versions of OpenFlow",
-                           ds_cstr(&s), port32);
-            ds_destroy(&s);
+                           ds_cstr(&msg), port32);
+            ds_destroy(&msg);
 
             *portp = port32;
             return true;