Changeset 103448 in vbox for trunk/src/VBox/NetworkServices

Timestamp:

Feb 19, 2024 2:20:41 PM (9 months ago)

Author:

vboxsync

Message:

NetworkServices/NetLib/VBoxNetPortForwardString.cpp: Fix some parfait warnings, bugref:3409

File:

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

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

@@ -75 +75 @@
     AssertReturn(pszRaw[0] == PF_ADDRESS_FIELD_STARTS, -1);
 
-    if (pszRaw[0] == PF_ADDRESS_FIELD_STARTS)
-    {
-        /* shift pszRaw to next symbol */
-        pszRaw++;
-        cchRaw--;
-
-
-        /* we shouldn't face with ending here */
-        AssertReturn(cchRaw > 0, VERR_INVALID_PARAMETER);
-
-        char *pszEndOfAddress = RTStrStr(pszRaw, PF_STR_ADDRESS_FIELD_ENDS);
-
-        /* no pair closing sign */
-        AssertPtrReturn(pszEndOfAddress, VERR_INVALID_PARAMETER);
-
-        cchField = pszEndOfAddress - pszRaw;
-
-        /* field should be less then the rest of the string */
-        AssertReturn(cchField < cchRaw, VERR_INVALID_PARAMETER);
-
-        if (cchField != 0)
-            RTStrCopy(pszAddress, RT_MIN(cchField + 1, (size_t)cbAddress), pszRaw);
-        else if (!fEmptyAcceptable)
-            return -1;
-    }
+    /* shift pszRaw to next symbol */
+    pszRaw++;
+    cchRaw--;
+
+    /* we shouldn't face with ending here */
+    AssertReturn(cchRaw > 0, VERR_INVALID_PARAMETER);
+
+    char *pszEndOfAddress = RTStrStr(pszRaw, PF_STR_ADDRESS_FIELD_ENDS);
+
+    /* no pair closing sign */
+    AssertPtrReturn(pszEndOfAddress, VERR_INVALID_PARAMETER);
+
+    cchField = pszEndOfAddress - pszRaw;
+
+    /* field should be less then the rest of the string */
+    AssertReturn(cchField < cchRaw, VERR_INVALID_PARAMETER);
+
+    if (cchField != 0)
+        RTStrCopy(pszAddress, RT_MIN(cchField + 1, (size_t)cbAddress), pszRaw);
+    else if (!fEmptyAcceptable)
+        return -1;
 
     AssertReturn(pszRaw[cchField] == PF_ADDRESS_FIELD_ENDS, -1);
-
     return (int)cchField + 2; /* length of the field and closing braces */
 }
@@ -290 +285 @@
 
     /* name */
-    if (pszRaw[idxRaw] == PF_FIELD_SEPARATOR)
-        idxRaw = 1; /* begin of the next segment */
-    else
+    if (pszRaw[idxRaw] != PF_FIELD_SEPARATOR)
     {
         char *pszEndOfName = RTStrStr(pszRaw + 1, PF_STR_FIELD_SEPARATOR);
@@ -377 +370 @@
 invalid_parameter:
     RTStrFree(pszRawBegin);
-    if (pPfr)
-        RT_ZERO(*pPfr);
+    RT_ZERO(*pPfr);
     return VERR_INVALID_PARAMETER;
 }