diff mbox

[ovs-dev,2/3] datapath-windows: Removed double initialization on local variables

Message ID A72F304F698C474CA65707A3507A0C95291A1176@CBSEX1.cloudbase.local
State Not Applicable
Headers show

Commit Message

Sorin Vinturis April 18, 2016, 7:42 a.m. UTC
I had a few minor comments inline, but the patch looks good.

Acked-by: Sorin Vinturis <svinturis@cloudbasesolutions.com>


-----Original Message-----
From: dev [mailto:dev-bounces@openvswitch.org] On Behalf Of Paul Boca

Sent: Friday, 15 April, 2016 18:05
To: dev@openvswitch.org
Subject: [ovs-dev] [PATCH 2/3] datapath-windows: Removed double initialization on local variables

Signed-off-by: Paul-Daniel Boca <pboca@cloudbasesolutions.com>

---
 datapath-windows/ovsext/Actions.c         |  8 ++++----
 datapath-windows/ovsext/Flow.c            |  2 +-
 datapath-windows/ovsext/IpHelper.c        |  4 ++--
 datapath-windows/ovsext/Netlink/Netlink.c |  2 +-
 datapath-windows/ovsext/Oid.c             |  2 +-
 datapath-windows/ovsext/PacketParser.c    |  1 -
 datapath-windows/ovsext/Tunnel.c          |  2 +-
 datapath-windows/ovsext/TunnelFilter.c    | 12 ++++++------
 8 files changed, 16 insertions(+), 17 deletions(-)

-    NTSTATUS status = STATUS_SUCCESS;
+    NTSTATUS status;
 
     FWPS_CALLOUT sCallout = {0};
     FWPM_CALLOUT mCallout = {0};
@@ -449,7 +449,7 @@ Exit:
 NTSTATUS
 OvsTunnelRegisterCallouts(VOID *deviceObject)  {
-    NTSTATUS        status = STATUS_SUCCESS;
+    NTSTATUS        status;
     BOOLEAN         inTransaction = FALSE;
     FWPM_SUBLAYER   OvsTunnelSubLayer;
 
@@ -530,7 +530,7 @@ OvsTunnelFilterUninitialize(PDRIVER_OBJECT driverObject)  NTSTATUS  OvsTunnelFilterInitialize(PDRIVER_OBJECT driverObject)  {
-    NTSTATUS        status = STATUS_SUCCESS;
+    NTSTATUS        status;
     UNICODE_STRING  deviceName;
 
     RtlInitUnicodeString(&deviceName,
@@ -676,7 +676,7 @@ OvsUnsubscribeTunnelProviderBfeStateChanges()
 VOID
 OvsRegisterSystemProvider(PVOID deviceObject)  {
-    NTSTATUS status = STATUS_SUCCESS;
+    NTSTATUS status;
     HANDLE engineSession = NULL;
 
     status = OvsSubscribeTunnelProviderBfeStateChanges(deviceObject);
@@ -883,7 +883,7 @@ OvsTunnelAddFilterEx(HANDLE engineSession,
                      UINT32 filterPort,
                      UINT64 *filterID)
 {
-    NTSTATUS status = STATUS_SUCCESS;
+    NTSTATUS status;
 
     status = OvsTunnelAddFilter(engineSession,
                                 L"Datagram-Data OVS Filter (Inbound)",
--
2.7.2.windows.1
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
diff mbox

Patch

diff --git a/datapath-windows/ovsext/Actions.c b/datapath-windows/ovsext/Actions.c
index cf54ae2..7e45db7 100644
--- a/datapath-windows/ovsext/Actions.c
+++ b/datapath-windows/ovsext/Actions.c
@@ -983,7 +983,7 @@  static __inline NDIS_STATUS  OvsOutputBeforeSetAction(OvsForwardingContext *ovsFwdCtx)  {
     PNET_BUFFER_LIST newNbl;
-    NDIS_STATUS status = NDIS_STATUS_SUCCESS;
+    NDIS_STATUS status;
 
     /*
      * Create a copy and work on the copy after this point. The original NBL is @@ -1142,7 +1142,7 @@ static __inline NDIS_STATUS  OvsActionMplsPop(OvsForwardingContext *ovsFwdCtx,
                  ovs_be16 ethertype)
 {
-    NDIS_STATUS status = NDIS_STATUS_SUCCESS;
+    NDIS_STATUS status;
     OVS_PACKET_HDR_INFO *layers = &ovsFwdCtx->layers;
     EthHdr *ethHdr = NULL;
 
@@ -1945,7 +1945,7 @@  OvsActionsExecute(POVS_SWITCH_CONTEXT switchContext,
                   const PNL_ATTR actions,
                   INT actionsLen)
 {
-    NDIS_STATUS status = STATUS_SUCCESS;
+    NDIS_STATUS status;
 
     status = OvsDoExecuteActions(switchContext, completionList, curNbl,
                                  portNo, sendFlags, key, hash, layers, @@ -1974,7 +1974,7 @@ OvsDoRecirc(POVS_SWITCH_CONTEXT switchContext,
             UINT32 srcPortNo,
             OVS_PACKET_HDR_INFO *layers)  {
-    NDIS_STATUS status = NDIS_STATUS_SUCCESS;
+    NDIS_STATUS status;
     OvsFlow *flow = NULL;

SV: You could do the same with the 'flow' pointer.

     OvsForwardingContext ovsFwdCtx = { 0 };
     UINT64 hash = 0;
diff --git a/datapath-windows/ovsext/Flow.c b/datapath-windows/ovsext/Flow.c index a7e9bd2..1f23625 100644
--- a/datapath-windows/ovsext/Flow.c
+++ b/datapath-windows/ovsext/Flow.c
@@ -723,7 +723,7 @@  done:
 static NTSTATUS
 _MapFlowInfoToNl(PNL_BUFFER nlBuf, OvsFlowInfo *flowInfo)  {
-    NTSTATUS rc = STATUS_SUCCESS;
+    NTSTATUS rc;
 
     rc = MapFlowKeyToNlKey(nlBuf, &(flowInfo->key), OVS_FLOW_ATTR_KEY,
                            OVS_KEY_ATTR_TUNNEL); diff --git a/datapath-windows/ovsext/IpHelper.c b/datapath-windows/ovsext/IpHelper.c
index 8126222..d747e8c 100644
--- a/datapath-windows/ovsext/IpHelper.c
+++ b/datapath-windows/ovsext/IpHelper.c
@@ -231,7 +231,7 @@  OvsGetIPEntry(NET_LUID interfaceLuid,
     NTSTATUS status;
     UINT32 i;
 
-    if (ipEntry == NULL || ipEntry == NULL) {
+    if (ipEntry == NULL) {
         return STATUS_INVALID_PARAMETER;
     }
 
@@ -1209,7 +1209,7 @@  static VOID
 OvsHandleFwdRequest(POVS_IP_HELPER_REQUEST request)  {
     SOCKADDR_INET dst, src;
-    NTSTATUS status = STATUS_SUCCESS;
+    NTSTATUS status;

SV: The same applies for 'fwdEntry', 'ipf' and 'ipn'.

     MIB_IPFORWARD_ROW2 ipRoute;
     MIB_IPNET_ROW2 ipNeigh;
     OVS_FWD_INFO fwdInfo;
diff --git a/datapath-windows/ovsext/Netlink/Netlink.c b/datapath-windows/ovsext/Netlink/Netlink.c
index e2312da..27dcd4f 100644
--- a/datapath-windows/ovsext/Netlink/Netlink.c
+++ b/datapath-windows/ovsext/Netlink/Netlink.c
@@ -565,7 +565,7 @@  NlMsgPutNested(PNL_BUFFER buf, UINT16 type,
                const PVOID data, UINT32 size)  {
     UINT32 offset = NlMsgStartNested(buf, type);
-    BOOLEAN ret = FALSE;
+    BOOLEAN ret;
 
     ASSERT(offset);
 
diff --git a/datapath-windows/ovsext/Oid.c b/datapath-windows/ovsext/Oid.c index 93894ae..7c7ffe7 100644
--- a/datapath-windows/ovsext/Oid.c
+++ b/datapath-windows/ovsext/Oid.c
@@ -366,7 +366,7 @@  OvsExtOidRequest(NDIS_HANDLE filterModuleContext,
                  PNDIS_OID_REQUEST oidRequest)  {
     POVS_SWITCH_CONTEXT switchObject = (POVS_SWITCH_CONTEXT)filterModuleContext;
-    NDIS_STATUS status = NDIS_STATUS_SUCCESS;
+    NDIS_STATUS status;
     PNDIS_OID_REQUEST clonedOidRequest = NULL;
     struct _METHOD *methodInfo = &(oidRequest->DATA.METHOD_INFORMATION);
     BOOLEAN completeOid = FALSE;
diff --git a/datapath-windows/ovsext/PacketParser.c b/datapath-windows/ovsext/PacketParser.c
index bd6910c..93df342 100644
--- a/datapath-windows/ovsext/PacketParser.c
+++ b/datapath-windows/ovsext/PacketParser.c
@@ -93,7 +93,6 @@  OvsParseIPv6(const NET_BUFFER_LIST *packet,
     UINT32 nextHdr;
     Ipv6Key *flow= &key->ipv6Key;
 
-    ofs = layers->l3Offset;
     nh = OvsGetPacketBytes(packet, sizeof *nh, ofs, &ipv6HdrStorage);
     if (!nh) {
         return NDIS_STATUS_FAILURE;
diff --git a/datapath-windows/ovsext/Tunnel.c b/datapath-windows/ovsext/Tunnel.c
index e957aaf..7aee2b6 100644
--- a/datapath-windows/ovsext/Tunnel.c
+++ b/datapath-windows/ovsext/Tunnel.c
@@ -214,7 +214,7 @@  static NTSTATUS
 OvsInjectPacketThroughActions(PNET_BUFFER_LIST pNbl,
                               OVS_TUNNEL_PENDED_PACKET *packet)  {
-    NTSTATUS status = STATUS_SUCCESS;
+    NTSTATUS status;
     OvsIPv4TunnelKey tunnelKey;
     NET_BUFFER *pNb;
     ULONG sendCompleteFlags = 0;

SV: 'datapath' should also be initialized with '&gOvsSwitchContext->datapath' at declaration.

diff --git a/datapath-windows/ovsext/TunnelFilter.c b/datapath-windows/ovsext/TunnelFilter.c
index 3d5eb57..649f5bc 100644
--- a/datapath-windows/ovsext/TunnelFilter.c
+++ b/datapath-windows/ovsext/TunnelFilter.c
@@ -206,7 +206,7 @@  static OVS_TUNFLT_THREAD_CONTEXT gTunnelThreadCtx[OVS_TUNFLT_MAX_THREADS] = { 0  NTSTATUS  OvsTunnelEngineOpen(HANDLE *engineSession)  {
-    NTSTATUS status = STATUS_SUCCESS;
+    NTSTATUS status;
     FWPM_SESSION session = { 0 };
 
     /*
@@ -387,7 +387,7 @@  OvsTunnelRegisterDatagramDataCallouts(const GUID *layerKey,
                                       VOID *deviceObject,
                                       UINT32 *calloutId)  {