Changeset 26482 in vbox

Timestamp:

Feb 14, 2010 1:38:44 AM (15 years ago)

Author:

vboxsync

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

57651

Message:

IPRT: Added RTStrATruncate.

Location:

trunk

Files:

• include/iprt/string.h (modified) (2 diffs)
• src/VBox/Runtime/common/string/stringalloc.cpp (modified) (1 diff)
• src/VBox/Runtime/testcase/tstRTStrAlloc.cpp (modified) (1 diff)

trunk/include/iprt/string.h

@@ -258 +258 @@
 
 /**
+ * Truncates an IPRT allocated string.
+ *
+ * @retval  VINF_SUCCESS.
+ * @retval  VERR_OUT_OF_RANGE if cchNew is too long.  Nothing is done.
+ *
+ * @param   ppsz                Pointer to the string pointer.  The string
+ *                              pointer can be NULL if @a cchNew is 0, no change
+ *                              is made then.  If we actually reallocate the
+ *                              string, the string pointer might be changed by
+ *                              this call.  (In/Out)
+ * @param   cchNew              The new string length (excluding the
+ *                              terminator).  The string must be at least this
+ *                              long or we'll return VERR_OUT_OF_RANGE and
+ *                              assert on you.
+ */
+RTDECL(int) RTStrATruncate(char **ppsz, size_t cchNew);
+
+/**
  * Allocates memory for string storage.
  *
@@ -302 +320 @@
  *
  * You should normally not have use this function, except perhaps to truncate a
- * really long string you've got from some IPRT string API.
+ * really long string you've got from some IPRT string API, but then you should
+ * use RTStrATruncate.
  *
  * @returns VINF_SUCCESS.

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

@@ -249 +249 @@
 RT_EXPORT_SYMBOL(RTStrAAppendExN);
 
+
+RTDECL(int) RTStrATruncate(char **ppsz, size_t cchNew)
+{
+    char *pszOld = *ppsz;
+    if (!cchNew)
+    {
+        if (pszOld && *pszOld)
+        {
+            *pszOld = '\0';
+            char *pszNew = (char *)RTMemRealloc(pszOld, 1);
+            if (!pszNew)
+                *ppsz = pszNew;
+        }
+    }
+    else
+    {
+        AssertPtrReturn(pszOld, VERR_OUT_OF_RANGE);
+        char *pszZero = (char *)memchr(pszOld, '\0', cchNew + 63);
+        AssertReturn(!pszZero || (size_t)(pszZero - pszOld) >= cchNew, VERR_OUT_OF_RANGE);
+        pszOld[cchNew] = '\0';
+        if (!pszZero)
+        {
+            char *pszNew = (char *)RTMemRealloc(pszOld,  cchNew + 1);
+            if (pszNew)
+                *ppsz = pszNew;
+        }
+    }
+    return VINF_SUCCESS;
+}
+RT_EXPORT_SYMBOL(RTStrATruncate);
+

trunk/src/VBox/Runtime/testcase/tstRTStrAlloc.cpp

@@ -203 +203 @@
     RTTESTI_CHECK(!RTStrCmp(psz, "abcdefghijklmnopqrstuvwxyz-"));
     RTStrFree(psz);
+
+    /* RTStrATruncate */
+    psz = NULL;
+    RTTESTI_CHECK_RC(RTStrATruncate(&psz, 0), VINF_SUCCESS);
+    RTTESTI_CHECK(!psz);
+
+    RTTESTI_CHECK(psz = RTStrDup(""));
+    RTTESTI_CHECK_RC(RTStrATruncate(&psz, 0), VINF_SUCCESS);
+    RTStrFree(psz);
+
+    RTTESTI_CHECK(psz = RTStrDup("1234567890"));
+    RTTESTI_CHECK_RC(RTStrATruncate(&psz, 5), VINF_SUCCESS);
+    RTTESTI_CHECK(!RTStrCmp(psz, "12345"));
+    RTStrFree(psz);
+
+    psz = NULL;
+    for (uint32_t i = 0; i < 128; i++)
+        RTTESTI_CHECK_RC_RETV(RTStrAAppend(&psz, "abcdefghijklmnopqrstuvwxyz"), VINF_SUCCESS);
+    RTTESTI_CHECK_RC(RTStrATruncate(&psz, sizeof("abcdefghijklmnopqrstuvwxyz") - 1), VINF_SUCCESS);
+    RTTESTI_CHECK(!RTStrCmp(psz, "abcdefghijklmnopqrstuvwxyz"));
+    RTTESTI_CHECK_RC(RTStrATruncate(&psz, 6), VINF_SUCCESS);
+    RTTESTI_CHECK(!RTStrCmp(psz, "abcdef"));
+    RTTESTI_CHECK_RC(RTStrATruncate(&psz, 1), VINF_SUCCESS);
+    RTTESTI_CHECK(!RTStrCmp(psz, "a"));
+    RTTESTI_CHECK_RC(RTStrATruncate(&psz, 0), VINF_SUCCESS);
+    RTTESTI_CHECK(!RTStrCmp(psz, ""));
+    RTStrFree(psz);
+
 }