exit mem_realloc, enters p_realloc/xrealloc.

[apps/madmutt.git] / lib / list.c

diff --git a/lib/list.c b/lib/list.c
index 1dd865f..23dcf26 100644 (file)
--- a/lib/list.c
+++ b/lib/list.c
@@ -10,13 +10,14 @@
 #include <stddef.h>
 #include <string.h>
 
+#include <lib-lib/mem.h>
+
 #include "list.h"
 
-#include "mem.h"
 #include "str.h"
 
 list2_t* list_new (void) {
-  return (mem_calloc (1, sizeof (list2_t)));
+  return p_new(list2_t, 1);
 }
 
 void list_del (list2_t** l, list_del_t* del) {
@@ -26,21 +27,21 @@ void list_del (list2_t** l, list_del_t* del) {
   if (del)
     for (i = 0; i < (*l)->length; i++)
       del (&(*l)->data[i]);
-  mem_free(&(*l)->data);
-  mem_free(l);
+  p_delete(&(*l)->data);
+  p_delete(l);
 }
 
 void list_push_back (list2_t** l, void* p) {
   if (!*l)
     *l = list_new ();
-  mem_realloc (&(*l)->data, (++(*l)->length)*sizeof(void*));
+  p_realloc(&(*l)->data, ++(*l)->length);
   (*l)->data[(*l)->length-1] = p;
 }
 
 void list_push_front (list2_t** l, void* p) {
   if (!*l)
     *l = list_new ();
-  mem_realloc (&(*l)->data, (++(*l)->length)*sizeof(void*));
+  p_realloc(&(*l)->data, ++(*l)->length);
   if ((*l)->length > 1)
     memmove (&(*l)->data[1], &(*l)->data[0], ((*l)->length-1)*sizeof(void*));
   (*l)->data[0] = p;
@@ -51,7 +52,7 @@ void* list_pop_back (list2_t* l) {
   if (list_empty(l))
     return (NULL);
   p = l->data[l->length-1];
-  mem_realloc (&l->data, --(l->length)*sizeof(void*));
+  p_realloc(&l->data, --(l->length));
   return (p);
 }
 
@@ -61,7 +62,7 @@ void* list_pop_front (list2_t* l) {
     return (NULL);
   p = l->data[0];
   memmove (&l->data[0], &l->data[1], (--(l->length))*sizeof(void*));
-  mem_realloc (&l->data, l->length*sizeof(void*));
+  p_realloc(&l->data, l->length);
   return (p);
 }
 
@@ -73,19 +74,18 @@ void* list_pop_idx (list2_t* l, int c) {
     return (list_pop_back (l));
   p = l->data[c];
   memmove (&l->data[c], &l->data[c+1], (l->length-c)*sizeof(void*));
-  mem_realloc (&l->data, (--(l->length))*sizeof(void*));
+  p_realloc(&l->data, --(l->length));
   return (p);
 }
 
-list2_t* list_cpy (list2_t* l) {
-  list2_t* ret = NULL;
-  if (list_empty(l))
-    return (NULL);
-  ret = list_new ();
-  ret->length = l->length;
-  ret->data = mem_malloc (l->length*sizeof(void*));
-  memcpy (ret->data, l->data, l->length*sizeof(void*));
-  return (ret);
+list2_t *list_cpy(list2_t *l) {
+    list2_t* ret = NULL;
+    if (list_empty(l))
+        return NULL;
+    ret = list_new();
+    ret->length = l->length;
+    ret->data = p_dup(l->data, l->length);
+    return ret;
 }
 
 list2_t* list_dup (list2_t* l, void* (*dup) (void*)) {
@@ -95,7 +95,7 @@ list2_t* list_dup (list2_t* l, void* (*dup) (void*)) {
     return (NULL);
   ret = list_new ();
   ret->length = l->length;
-  ret->data = mem_malloc (l->length*sizeof(void*));
+  ret->data = p_new(void*, l->length);
   for (i = 0; i < l->length; i++)
     ret->data[i] = dup (l->data[i]);
   return (ret);
@@ -122,7 +122,7 @@ list2_t* list_from_str (const char* str, const char* delim) {
   for (p = strtok (tmp, delim); p; p = strtok (NULL, delim)) {
     list_push_back (&ret, str_dup (p));
   }
-  mem_free (&tmp);
+  p_delete(&tmp);
   return (ret);
 }