2
0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 06:15:47 +00:00

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>
This commit is contained in:
Ben Pfaff
2013-01-24 13:56:10 -08:00
parent 316bd0f822
commit a6b112a8b3

View File

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