From: Ben Pfaff <blp@nicira.com>
Date: Thu, 24 Jan 2013 21:57:37 +0000 (-0800)
Subject: bridge: Rename iface_create() variable to avoid hiding parameter.
X-Git-Tag: v1.10.0~125
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=0d7bb1b4f4982637b316e51a258e8efaabb3e431;p=cascardo%2Fovs.git

bridge: Rename iface_create() variable to avoid hiding parameter.

This function has a parameter 'ofp_port' and a local variable 'ofp_port',
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/vswitchd/bridge.c b/vswitchd/bridge.c
index dd3099f84..607ae5e18 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -1446,9 +1446,9 @@ iface_create(struct bridge *br, struct if_cfg *if_cfg, int ofp_port)
 
             error = netdev_open(port->name, "internal", &netdev);
             if (!error) {
-                uint16_t ofp_port = if_cfg->ofport;
+                uint16_t fake_ofp_port = if_cfg->ofport;
 
-                ofproto_port_add(br->ofproto, netdev, &ofp_port);
+                ofproto_port_add(br->ofproto, netdev, &fake_ofp_port);
                 netdev_close(netdev);
             } else {
                 VLOG_WARN("could not open network device %s (%s)",