Changeset 63284 in vbox for trunk/src/VBox/NetworkServices/NetLib

Timestamp:

Aug 10, 2016 3:01:05 PM (8 years ago)

Author:

vboxsync

Message:

NetworkServices: warnings

File:

• trunk/src/VBox/NetworkServices/NetLib/VBoxNetPortForwardString.cpp (modified) (15 diffs)

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

@@ -52 +52 @@
 
 
-static int netPfStrAddressParse(char *pszRaw, size_t cbRaw,
+static int netPfStrAddressParse(char *pszRaw, size_t cchRaw,
                                 char *pszAddress, int cbAddress,
                                 bool fEmptyAcceptable)
 {
-    int cbField = 0;
+    size_t cchField = 0;
 
     AssertPtrReturn(pszRaw, -1);
@@ -66 +66 @@
         /* shift pszRaw to next symbol */
         pszRaw++;
-        cbRaw--;
+        cchRaw--;
 
 
         /* we shouldn't face with ending here */
-        AssertReturn(cbRaw > 0, VERR_INVALID_PARAMETER);
+        AssertReturn(cchRaw > 0, VERR_INVALID_PARAMETER);
 
         char *pszEndOfAddress = RTStrStr(pszRaw, PF_STR_ADDRESS_FIELD_ENDS);
@@ -77 +77 @@
         AssertPtrReturn(pszEndOfAddress, VERR_INVALID_PARAMETER);
 
-        cbField = pszEndOfAddress - pszRaw;
+        cchField = pszEndOfAddress - pszRaw;
 
         /* field should be less then the rest of the string */
-        AssertReturn(cbField < cbRaw, VERR_INVALID_PARAMETER);
-
-        if (cbField != 0)
-            RTStrCopy(pszAddress, RT_MIN(cbField + 1, cbAddress), pszRaw);
+        AssertReturn(cchField < cchRaw, VERR_INVALID_PARAMETER);
+
+        if (cchField != 0)
+            RTStrCopy(pszAddress, RT_MIN(cchField + 1, cbAddress), pszRaw);
         else if (!fEmptyAcceptable)
             return -1;
     }
 
-    AssertReturn(pszRaw[cbField] == PF_ADDRESS_FIELD_ENDS, -1);
-
-    return cbField + 2; /* length of the field and closing braces */
+    AssertReturn(pszRaw[cchField] == PF_ADDRESS_FIELD_ENDS, -1);
+
+    return (int)cchField + 2; /* length of the field and closing braces */
 }
 
@@ -134 +134 @@
 
     pszRaw++; /* skip field separator */
-    cbRaw --;
+    cchRaw --;
 
     char *pszEndOfPort = RTStrStr(pszRaw, ":");
@@ -141 +141 @@
         cbRest = strlen(pszRaw);
 
-        Assert(cbRaw == cbRest);
+        Assert(cchRaw == cbRest);
 
         /* XXX: Assumption that if string is too big, it will be reported by
@@ -178 +178 @@
 
 
-static int netPfStrAddressPortPairParse(char *pszRaw, size_t cbRaw,
+static int netPfStrAddressPortPairParse(char *pszRaw, size_t cchRaw,
                                         char *pszAddress, int cbAddress,
                                         bool fEmptyAddressAcceptable,
@@ -195 +195 @@
 
     pszRaw++; /* field separator skip */
-    cbRaw--;
-    AssertReturn(cbRaw > 0, VERR_INVALID_PARAMETER);
+    cchRaw--;
+    AssertReturn(cchRaw > 0, VERR_INVALID_PARAMETER);
 
     idxRaw = 0;
@@ -203 +203 @@
     {
         idxRaw += netPfStrAddressParse(pszRaw,
-                                       cbRaw - idxRaw,
+                                       cchRaw - idxRaw,
                                        pszAddress,
                                        cbAddress,
@@ -216 +216 @@
     pszRaw += idxRaw;
     idxRawTotal += idxRaw;
-    cbRaw -= idxRaw;
-
-    AssertReturn(cbRaw > 0, VERR_INVALID_PARAMETER);
+    cchRaw -= idxRaw;
+
+    AssertReturn(cchRaw > 0, VERR_INVALID_PARAMETER);
 
     idxRaw = 0;
@@ -265 +265 @@
     char *pszName = &pPfr->szPfrName[0];
 
-    size_t cbRaw = strlen(pcszStrPortForward);
+    size_t cchRaw = strlen(pcszStrPortForward);
 
     /* Minimal rule ":tcp:[]:0:[]:0" has got lenght 14 */
-    AssertReturn(cbRaw > 14, VERR_INVALID_PARAMETER);
+    AssertReturn(cchRaw > 14, VERR_INVALID_PARAMETER);
 
     char *pszRaw = RTStrDup(pcszStrPortForward);
@@ -286 +286 @@
         cbToken = pszEndOfName - pszRaw; /* don't take : into account */
         /* XXX it's unacceptable to have only name entry in PF */
-        AssertReturn(cbToken < cbRaw, VERR_INVALID_PARAMETER);
+        AssertReturn(cbToken < cchRaw, VERR_INVALID_PARAMETER);
 
         if (   cbToken < 0
@@ -296 +296 @@
                   pszRaw);
         pszRaw += cbToken; /* move to separator */
-        cbRaw -= cbToken;
+        cchRaw -= cbToken;
     }
 
@@ -303 +303 @@
 
     pszRaw++; /* skip separator */
-    cbRaw--;
+    cchRaw--;
     idxRaw = 0;
 
@@ -317 +317 @@
 
     pszRaw += idxRaw;
-    cbRaw -= idxRaw;
-
-    idxRaw = netPfStrAddressPortPairParse(pszRaw, cbRaw,
+    cchRaw -= idxRaw;
+
+    idxRaw = netPfStrAddressPortPairParse(pszRaw, cchRaw,
                                           pszHostAddr, INET6_ADDRSTRLEN,
                                           true, &u16HostPort);
@@ -326 +326 @@
 
     pszRaw += idxRaw;
-    cbRaw -= idxRaw;
+    cchRaw -= idxRaw;
 
     Assert(pszRaw[0] == PF_FIELD_SEPARATOR);
 
-    idxRaw = netPfStrAddressPortPairParse(pszRaw, cbRaw,
+    idxRaw = netPfStrAddressPortPairParse(pszRaw, cchRaw,
                                           pszGuestAddr, INET6_ADDRSTRLEN,
                                           false, &u16GuestPort);