Changeset 36407 in vbox for trunk/src/VBox/Runtime/common/string

Timestamp:

Mar 24, 2011 4:14:57 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

70762

Message:

IPRT: Added RTStrCopyP, RTStrCopyPEx, RTStrCatP and RTStrCatPEx. These functions will advance the destination buffer pointer and size parameters.

Location:

trunk/src/VBox/Runtime/common/string

Files:

• RTStrCatP.cpp (copied) (copied from trunk/src/VBox/Runtime/common/string/RTStrCat.cpp ) (1 diff)
• RTStrCatPEx.cpp (copied) (copied from trunk/src/VBox/Runtime/common/string/RTStrCatEx.cpp ) (2 diffs)
• RTStrCopyP.cpp (copied) (copied from trunk/src/VBox/Runtime/common/string/RTStrCopy.cpp ) (3 diffs)
• RTStrCopyPEx.cpp (copied) (copied from trunk/src/VBox/Runtime/common/string/RTStrCopyEx.cpp ) (3 diffs)

trunk/src/VBox/Runtime/common/string/RTStrCatP.cpp

@@ -33 +33 @@
 
 
-RTDECL(int) RTStrCat(char *pszDst, size_t cbDst, const char *pszSrc)
+RTDECL(int) RTStrCatP(char **ppszDst, size_t *pcbDst, const char *pszSrc)
 {
-    char *pszDst2 = RTStrEnd(pszDst, cbDst);
-    AssertReturn(pszDst2, VERR_INVALID_PARAMETER);
-    cbDst -= pszDst2 - pszDst;
+    /*
+     * Advance past the current string in the output buffer and turn this into
+     * a copy operation.
+     */
+    size_t  cbDst  = *pcbDst;
+    char   *pszDst = RTStrEnd(*ppszDst, *pcbDst);
+    AssertReturn(pszDst, VERR_INVALID_PARAMETER);
+    *pcbDst -= pszDst - *ppszDst;
+    *ppszDst = pszDst;
 
-    size_t cchSrc = strlen(pszSrc);
-    if (RT_LIKELY(cchSrc < cbDst))
-    {
-        memcpy(pszDst2, pszSrc, cchSrc + 1);
-        return VINF_SUCCESS;
-    }
+    return RTStrCopyP(ppszDst, pcbDst, pszSrc);
+}
+RT_EXPORT_SYMBOL(RTStrCatP);
 
-    if (cbDst != 0)
-    {
-        memcpy(pszDst2, pszSrc, cbDst - 1);
-        pszDst2[cbDst - 1] = '\0';
-    }
-    return VERR_BUFFER_OVERFLOW;
-}
-RT_EXPORT_SYMBOL(RTStrCat);
-

trunk/src/VBox/Runtime/common/string/RTStrCatPEx.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - RTStrCatEx
+ * IPRT - RTStrCatPEx
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -33 +33 @@
 
 
-RTDECL(int) RTStrCatEx(char *pszDst, size_t cbDst, const char *pszSrc, size_t cchMaxSrc)
+RTDECL(int) RTStrCatPEx(char **ppszDst, size_t *pcbDst, const char *pszSrc, size_t cchMaxSrc)
 {
-    char *pszDst2 = RTStrEnd(pszDst, cbDst);
-    AssertReturn(pszDst2, VERR_INVALID_PARAMETER);
-    cbDst -= pszDst2 - pszDst;
+    /*
+     * Advance past the current string in the output buffer and turn this into
+     * a copy operation.
+     */
+    size_t  cbDst  = *pcbDst;
+    char   *pszDst = RTStrEnd(*ppszDst, cbDst);
+    AssertReturn(pszDst, VERR_INVALID_PARAMETER);
+    *pcbDst -= pszDst - *ppszDst;
+    *ppszDst = pszDst;
 
-    const char *pszSrcEol = RTStrEnd(pszSrc, cchMaxSrc);
-    size_t      cchSrc    = pszSrcEol ? (size_t)(pszSrcEol - pszSrc) : cchMaxSrc;
-    if (RT_LIKELY(cchSrc < cbDst))
-    {
-        memcpy(pszDst2, pszSrc, cchSrc);
-        pszDst2[cchSrc] = '\0';
-        return VINF_SUCCESS;
-    }
+    return RTStrCopyPEx(ppszDst, pcbDst, pszSrc, cchMaxSrc);
+}
+RT_EXPORT_SYMBOL(RTStrCatPEx);
 
-    if (cbDst != 0)
-    {
-        memcpy(pszDst2, pszSrc, cbDst - 1);
-        pszDst2[cbDst - 1] = '\0';
-    }
-    return VERR_BUFFER_OVERFLOW;
-}
-RT_EXPORT_SYMBOL(RTStrCatEx);
-

trunk/src/VBox/Runtime/common/string/RTStrCopyP.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - RTStrCopy.
+ * IPRT - RTStrCopyP.
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -33 +33 @@
 
 
-RTDECL(int) RTStrCopy(char *pszDst, size_t cbDst, const char *pszSrc)
+RTDECL(int) RTStrCopyP(char **ppszDst, size_t *pcbDst, const char *pszSrc)
 {
-    size_t cchSrc = strlen(pszSrc);
+    size_t const    cchSrc = strlen(pszSrc);
+    size_t const    cbDst  = *pcbDst;
+    char           *pszDst = *ppszDst;
     if (RT_LIKELY(cchSrc < cbDst))
     {
         memcpy(pszDst, pszSrc, cchSrc + 1);
+        *ppszDst = pszDst += cchSrc;
+        *pcbDst -= cchSrc;
         return VINF_SUCCESS;
     }
@@ -44 +48 @@
     if (cbDst != 0)
     {
-        memcpy(pszDst, pszSrc, cbDst - 1);
-        pszDst[cbDst - 1] = '\0';
+        memcpy(*ppszDst, pszSrc, cbDst - 1);
+        *ppszDst = pszDst += cbDst - 1;
+        *pszDst  = '\0';
+        *pcbDst  = 1;
     }
     return VERR_BUFFER_OVERFLOW;
 }
-RT_EXPORT_SYMBOL(RTStrCopy);
+RT_EXPORT_SYMBOL(RTStrCopyP);
 

trunk/src/VBox/Runtime/common/string/RTStrCopyPEx.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - RTStrCopyEx.
+ * IPRT - RTStrCopyPEx.
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -33 +33 @@
 
 
-RTDECL(int) RTStrCopyEx(char *pszDst, size_t cbDst, const char *pszSrc, size_t cchMaxSrc)
+RTDECL(int) RTStrCopyPEx(char **ppszDst, size_t *pcbDst, const char *pszSrc, size_t cchMaxSrc)
 {
-    const char *pszSrcEol = RTStrEnd(pszSrc, cchMaxSrc);
-    size_t      cchSrc    = pszSrcEol ? (size_t)(pszSrcEol - pszSrc) : cchMaxSrc;
+    const char  *pszSrcEol = RTStrEnd(pszSrc, cchMaxSrc);
+    size_t       cchSrc    = pszSrcEol ? (size_t)(pszSrcEol - pszSrc) : cchMaxSrc;
+    size_t const cbDst     = *pcbDst;
+    char        *pszDst    = *ppszDst;
     if (RT_LIKELY(cchSrc < cbDst))
     {
         memcpy(pszDst, pszSrc, cchSrc);
-        pszDst[cchSrc] = '\0';
+        *ppszDst = pszDst += cchSrc;
+        *pszDst  = '\0';
+        *pcbDst -= cchSrc;
         return VINF_SUCCESS;
     }
@@ -46 +50 @@
     if (cbDst != 0)
     {
-        memcpy(pszDst, pszSrc, cbDst - 1);
-        pszDst[cbDst - 1] = '\0';
+        memcpy(*ppszDst, pszSrc, cbDst - 1);
+        *ppszDst = pszDst += cbDst - 1;
+        *pszDst  = '\0';
+        *pcbDst  = 1;
     }
     return VERR_BUFFER_OVERFLOW;
 }
-RT_EXPORT_SYMBOL(RTStrCopyEx);
+RT_EXPORT_SYMBOL(RTStrCopyPEx);