Changeset 45122 in vbox

Timestamp:

Mar 21, 2013 10:11:34 AM (12 years ago)

Author:

vboxsync

Message:

IPRT/net: moved RTNetStrToIPv4Addr to netaddrstr2.cpp

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (1 diff)
• common/net/netaddrstr.cpp (modified) (1 diff)
• common/net/netaddrstr2.cpp (added)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -341 +341 @@
         common/misc/uri.cpp \
         common/net/netaddrstr.cpp \
+        common/net/netaddrstr2.cpp \
         common/path/rtPathRootSpecLen.cpp \
         common/path/rtPathVolumeSpecLen.cpp \

trunk/src/VBox/Runtime/common/net/netaddrstr.cpp

@@ -1284 +1284 @@
 }
 RT_EXPORT_SYMBOL(RTNetIsIPv4AddrStr);
-
-
-/** @todo r=bird: move to separate file, netaddrstr2.cpp without the contrib
- *        statement in the header. This is our code. */
-RTDECL(int) RTNetStrToIPv4Addr(const char *pszAddr, PRTNETADDRIPV4 pAddr)
-{
-    char *pszNext;
-    AssertPtrReturn(pszAddr, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(pAddr, VERR_INVALID_PARAMETER);
-
-    int rc = RTStrToUInt8Ex(RTStrStripL(pszAddr), &pszNext, 10, &pAddr->au8[0]);
-    if (rc != VINF_SUCCESS && rc != VWRN_TRAILING_CHARS)
-        return VERR_INVALID_PARAMETER;
-    if (*pszNext++ != '.')
-        return VERR_INVALID_PARAMETER;
-
-    rc = RTStrToUInt8Ex(pszNext, &pszNext, 10, &pAddr->au8[1]);
-    if (rc != VINF_SUCCESS && rc != VWRN_TRAILING_CHARS)
-        return VERR_INVALID_PARAMETER;
-    if (*pszNext++ != '.')
-        return VERR_INVALID_PARAMETER;
-
-    rc = RTStrToUInt8Ex(pszNext, &pszNext, 10, &pAddr->au8[2]);
-    if (rc != VINF_SUCCESS && rc != VWRN_TRAILING_CHARS)
-        return VERR_INVALID_PARAMETER;
-    if (*pszNext++ != '.')
-        return VERR_INVALID_PARAMETER;
-
-    rc = RTStrToUInt8Ex(pszNext, &pszNext, 10, &pAddr->au8[3]);
-    if (rc != VINF_SUCCESS && rc != VWRN_TRAILING_SPACES)
-        return VERR_INVALID_PARAMETER;
-    pszNext = RTStrStripL(pszNext);
-    if (*pszNext)
-        return VERR_INVALID_PARAMETER;
-
-    return VINF_SUCCESS;
-}
-RT_EXPORT_SYMBOL(RTNetStrToIPv4Addr);
-