From: Ben Pfaff <blp@nicira.com>
Date: Thu, 4 Mar 2010 18:05:18 +0000 (-0800)
Subject: ofproto: Don't shadow global variable name.
X-Git-Tag: v1.0.0~259^2~52
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=39a559f2a77e78c53f439a904986337b0d6d15cf;p=sliver-openvswitch.git

ofproto: Don't shadow global variable name.

There was already a file scope variable named 'rl', so don't use it as
a local variable name too.

Reported-by: Jean Tourrilhes <jt@hpl.hp.com>
---

diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index 189aa2c82..1211cb708 100644
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -808,8 +808,8 @@ ofproto_run1(struct ofproto *p)
                 /* Someone destroyed the datapath behind our back.  The caller
                  * better destroy us and give up, because we're just going to
                  * spin from here on out. */
-                static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
-                VLOG_ERR_RL(&rl, "%s: datapath was destroyed externally",
+                static struct vlog_rate_limit rl2 = VLOG_RATE_LIMIT_INIT(1, 5);
+                VLOG_ERR_RL(&rl2, "%s: datapath was destroyed externally",
                             dpif_name(p->dpif));
                 return ENODEV;
             }