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

Timestamp:

Dec 14, 2001, 11:41:33 PM (24 years ago)

Author:

umoeller

Message:

Lots of changes for icons and refresh.

File:

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

trunk/src/helpers/stringh.c

@@ -42 +42 @@
 
 #define INCL_WINSHELLDATA
+#define INCL_DOSERRORS
 #include <os2.h>
 
@@ -68 +69 @@
  */
 
+#ifdef __DEBUG_MALLOC_ENABLED__
+
+/*
+ *@@ strhStoreDebug:
+ *      memory debug version of strhStore.
+ *
+ *@@added V0.9.16 (2001-12-08) [umoeller]
+ */
+
+APIRET strhStoreDebug(PSZ *ppszTarget,
+                      PCSZ pcszSource,
+                      PULONG pulLength,        // out: length of new string (ptr can be NULL)
+                      const char *pcszSourceFile,
+                      unsigned long ulLine,
+                      const char *pcszFunction)
+{
+    ULONG ulLength = 0;
+
+    if (ppszTarget)
+    {
+        if (*ppszTarget)
+            free(*ppszTarget);
+
+        if (    (pcszSource)
+             && (ulLength = strlen(pcszSource))
+           )
+        {
+            if (*ppszTarget = (PSZ)memdMalloc(ulLength + 1,
+                                              pcszSourceFile,
+                                              ulLine,
+                                              pcszFunction))
+                memcpy(*ppszTarget, pcszSource, ulLength + 1);
+            else
+                return (ERROR_NOT_ENOUGH_MEMORY);
+        }
+        else
+            *ppszTarget = NULL;
+    }
+
+    if (pulLength)
+        *pulLength = ulLength;
+
+    return (NO_ERROR);
+}
+
+#endif
+
 /*
  *@@ strhStore:
@@ -81 +129 @@
  */
 
-VOID strhStore(PSZ *ppszTarget,
-               PCSZ pcszSource,
-               PULONG pulLength)        // out: length of new string (ptr can be NULL)
+APIRET strhStore(PSZ *ppszTarget,
+                 PCSZ pcszSource,
+                 PULONG pulLength)        // out: length of new string (ptr can be NULL)
 {
     ULONG ulLength = 0;
@@ -98 +146 @@
             if (*ppszTarget = (PSZ)malloc(ulLength + 1))
                 memcpy(*ppszTarget, pcszSource, ulLength + 1);
+            else
+                return (ERROR_NOT_ENOUGH_MEMORY);
         }
         else
@@ -105 +155 @@
     if (pulLength)
         *pulLength = ulLength;
+
+    return (NO_ERROR);
 }
 
@@ -127 +179 @@
 
 /*
- *@@ strhdup:
+ *@@ strhdupDebug:
  *      memory debug version of strhdup.
  *
@@ -133 +185 @@
  */
 
-PSZ strhdupDebug(const char *pszSource,
+PSZ strhdupDebug(const char *pcszSource,
                  unsigned long *pulLength,
                  const char *pcszSourceFile,
@@ -147 +199 @@
     {
         if (pszReturn = (PSZ)memdMalloc(ulLength + 1,
-                                        pcszSourceFile,
+                                        pcszSourceFile,     // fixed V0.9.16 (2001-12-08) [umoeller]
                                         ulLine,
                                         pcszFunction))