Changeset 116 for trunk/src/helpers/stringh.c

Timestamp:

Nov 1, 2001, 6:43:18 PM (24 years ago)

Author:

umoeller

Message:

More updates.

File:

• trunk/src/helpers/stringh.c (modified) (2 diffs)

trunk/src/helpers/stringh.c

@@ -95 +95 @@
 
 PSZ strhdupDebug(const char *pszSource,
+                 unsigned long *pulLength,
                  const char *pcszSourceFile,
                  unsigned long ulLine,
                  const char *pcszFunction)
 {
-    if (pszSource)
-    {
-        PSZ p = (PSZ)memdMalloc(strlen(pszSource) + 1,
-                                pcszSourceFile,
-                                ulLine,
-                                pcszFunction);
-        strcpy(p,  pszSource);
-        return (p);
-    }
-    else
-        return (0);
+    PSZ     pszReturn = NULL;
+    ULONG   ulLength = 0;
+
+    if (    (pcszSource)
+         && (ulLength = strlen(pcszSource))
+       )
+    {
+        if (pszReturn = (PSZ)memdMalloc(ulLength + 1,
+                                        pcszSourceFile,
+                                        ulLine,
+                                        pcszFunction))
+            memcpy(pszReturn, pcszSource, ulLength + 1);
+    }
+
+    if (pulLength)
+        *pulLength = ulLength;
+
+    return (pszReturn);
 }
 
@@ -116 +124 @@
 /*
  *@@ strhdup:
- *      like strdup, but this one doesn't crash if pszSource is NULL,
- *      but returns NULL also.
+ *      like strdup, but this one doesn't crash if pszSource
+ *      is NULL, but returns NULL also. In addition, this
+ *      can report the length of the string (V0.9.16).
  *
  *@@added V0.9.0 [umoeller]
- */
-
-PSZ strhdup(const char *pszSource)
-{
-    if (pszSource)
-        return (strdup(pszSource));
-    else
-        return (0);
+ *@@changed V0.9.16 (2001-10-25) [umoeller]: added pulLength
+ */
+
+PSZ strhdup(const char *pcszSource,
+            unsigned long *pulLength)       // out: length of string excl. null terminator (ptr can be NULL)
+{
+    PSZ     pszReturn = NULL;
+    ULONG   ulLength = 0;
+
+    if (    (pcszSource)
+         && (ulLength = strlen(pcszSource))
+       )
+    {
+        if (pszReturn = (PSZ)malloc(ulLength + 1))
+            memcpy(pszReturn, pcszSource, ulLength + 1);
+    }
+
+    if (pulLength)
+        *pulLength = ulLength;
+
+    return (pszReturn);
 }