vbox的更動 55365 路徑 trunk/src/VBox/NetworkServices/NetLib/VBoxNetPortForwardString.cpp

時間撮記:

2015-4-22 上午09:34:46 (10 年 以前)

作者:

vboxsync

訊息:

NetworkServices: When handling COM/XPCOM events, always check if the event is for our network, otherwise ignore the event. Renamed {get/set}Network to {get/set}NetworkName(). Renamed {get/set}Name to {get/set}ServiceName(). Use RT_ZERO instead of memset if possible. Coding style.

檔案:

• trunk/src/VBox/NetworkServices/NetLib/VBoxNetPortForwardString.cpp (修改) (6 筆差異)

trunk/src/VBox/NetworkServices/NetLib/VBoxNetPortForwardString.cpp

@@ -234 +234 @@
     AssertPtrReturn(pPfr, VERR_INVALID_PARAMETER);
 
-    memset(pPfr, 0, sizeof(PORTFORWARDRULE));
+    RT_ZERO(*pPfr);
 
     pszHostAddr = &pPfr->szPfrHostAddr[0];
@@ -271 +271 @@
                   pszRaw);
         pszRaw += cbToken; /* move to separator */
+        cbRaw -= cbToken;
     }
 
@@ -277 +278 @@
 
     pszRaw++; /* skip separator */
+    cbRaw--;
     idxRaw = 0;
-
-    cbRaw--;
 
     if (  (  (fTcpProto = (RTStrNICmp(pszRaw, "tcp", 3) == 0))
@@ -293 +293 @@
     pszRaw += idxRaw;
     cbRaw -= idxRaw;
-    idxRaw = 0;
 
     idxRaw = netPfStrAddressPortPairParse(pszRaw, cbRaw,
@@ -306 +305 @@
     Assert(pszRaw[0] == PF_FIELD_SEPARATOR);
 
-    idxRaw = 0;
-
     idxRaw = netPfStrAddressPortPairParse(pszRaw, cbRaw,
-                                          pszGuestAddr,
-                                          INET6_ADDRSTRLEN,
-                                          false,
-                                          &u16GuestPort);
+                                          pszGuestAddr, INET6_ADDRSTRLEN,
+                                          false, &u16GuestPort);
 
     if (idxRaw < 0)
@@ -344 +339 @@
     RTStrFree(pszRawBegin);
     if (pPfr)
-        memset(pPfr, 0, sizeof(PORTFORWARDRULE));
+        RT_ZERO(*pPfr);
     return VERR_INVALID_PARAMETER;
 }