Changeset 2290 for trunk/src/kash/shinstance.c

Timestamp:

Feb 27, 2009, 5:08:07 AM (16 years ago)

Author:

bird

Message:

kash: malloc/free/friends gets a psh.

File:

• trunk/src/kash/shinstance.c (modified) (5 diffs)

trunk/src/kash/shinstance.c

@@ -169 +169 @@
 {
     memset(psh, 0, sizeof(*psh));
-    free(psh);
+    sh_free(NULL, psh);
 }
 
@@ -190 +190 @@
 
    /* alloc clone array. */
-   *dstp = dst = malloc(sizeof(*dst) * items + 1);
+   *dstp = dst = sh_malloc(NULL, sizeof(*dst) * items + 1);
    if (!dst)
        return -1;
@@ -198 +198 @@
    while (items-- > 0)
    {
-       dst[items] = strdup(src[items]);
+       dst[items] = sh_strdup(NULL, src[items]);
        if (!dst[items])
        {
            /* allocation error, clean up. */
            while (dst[++items])
-               free(dst[items]);
-           free(dst);
+               sh_free(NULL, dst[items]);
+           sh_free(NULL, dst);
            errno = ENOMEM;
            return -1;
@@ -231 +231 @@
      * The allocations.
      */
-    psh = calloc(sizeof(*psh), 1);
+    psh = sh_calloc(NULL, sizeof(*psh), 1);
     if (psh)
     {
@@ -344 +344 @@
 
     return ret;
+}
+
+/** malloc() */
+void *sh_malloc(shinstance *psh, size_t size)
+{
+    (void)psh;
+    return malloc(size);
+}
+
+/** calloc() */
+void *sh_calloc(shinstance *psh, size_t num, size_t size)
+{
+    (void)psh;
+    return calloc(num, size);
+}
+
+/** realloc() */
+void *sh_realloc(shinstance *psh, void *old, size_t new_size)
+{
+    return realloc(old, new_size);
+}
+
+/** strdup() */
+char *sh_strdup(shinstance *psh, const char *string)
+{
+    size_t len = strlen(string);
+    char *ret = sh_malloc(psh, len + 1);
+    if (ret)
+        memcpy(ret, string, len + 1);
+    return ret;
+}
+
+/** free() */
+void sh_free(shinstance *psh, void *ptr)
+{
+    if (ptr)
+        free(ptr);
+    (void)psh;
 }