diff mbox

[ovs-dev] datapath-windows: WDK 10 IpHelper rename local variables

Message ID 20161229002544.3060-1-aserdean@cloudbasesolutions.com
State Superseded
Headers show

Commit Message

Alin Serdean Dec. 29, 2016, 12:25 a.m. UTC 
Compiling under WDK 10 triggers some warnings in IpHelper, which lead
to a failing build.

The root cause is that local variables `ipAddr` and `link` hide the previous
local declaration.

This patch just renames the variables.

Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
---
 datapath-windows/ovsext/IpHelper.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Alin Serdean Dec. 29, 2016, 12:36 a.m. UTC | #1 
Please ignore this patch. I forgot to add renaming for `link`.

> -----Original Message-----
> From: Alin Serdean
> Sent: Thursday, December 29, 2016 2:26 AM
> To: dev@openvswitch.org
> Cc: Alin Serdean <aserdean@cloudbasesolutions.com>
> Subject: [PATCH] datapath-windows: WDK 10 IpHelper rename local variables
> 
> Compiling under WDK 10 triggers some warnings in IpHelper, which lead to a
> failing build.
> 
> The root cause is that local variables `ipAddr` and `link` hide the previous local
> declaration.
> 
> This patch just renames the variables.
> 
> Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
> ---
diff mbox

Patch

diff --git a/datapath-windows/ovsext/IpHelper.c b/datapath-windows/ovsext/IpHelper.c
index 0220572..0043564 100644
--- a/datapath-windows/ovsext/IpHelper.c
+++ b/datapath-windows/ovsext/IpHelper.c
@@ -1608,17 +1608,17 @@  OvsHandleFwdRequest(POVS_IP_HELPER_REQUEST request)
 
     status = OvsGetRoute(&dst, &ipRoute, &src, &instance, &fwdInfo.vport, request->fwdReq.tunnelKey.src);
     if (request->fwdReq.tunnelKey.src && request->fwdReq.tunnelKey.src != src.Ipv4.sin_addr.s_addr) {
-        UINT32 ipAddr = dst.Ipv4.sin_addr.s_addr;
+        UINT32 tempAddr = dst.Ipv4.sin_addr.s_addr;
         OVS_LOG_INFO("Fail to get route to %d.%d.%d.%d, status: %x",
-            ipAddr & 0xff, (ipAddr >> 8) & 0xff,
-            (ipAddr >> 16) & 0xff, (ipAddr >> 24) & 0xff, status);
+                     tempAddr & 0xff, (tempAddr >> 8) & 0xff,
+                     (tempAddr >> 16) & 0xff, (tempAddr >> 24) & 0xff, status);
         goto fwd_handle_nbl;
     }
     if (status != STATUS_SUCCESS || instance == NULL) {
-        UINT32 ipAddr = dst.Ipv4.sin_addr.s_addr;
+        UINT32 tempAddr = dst.Ipv4.sin_addr.s_addr;
         OVS_LOG_INFO("Fail to get route to %d.%d.%d.%d, status: %x",
-                     ipAddr & 0xff, (ipAddr >> 8) & 0xff,
-                     (ipAddr >> 16) & 0xff, (ipAddr >> 24) & 0xff, status);
+                     tempAddr & 0xff, (tempAddr >> 8) & 0xff,
+                     (tempAddr >> 16) & 0xff, (tempAddr >> 24) & 0xff, status);
         goto fwd_handle_nbl;
     }