X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib%2Flist.c;h=a454c8f7c44b27284bab307ce4bdc88a2d9bf6e6;hb=5945a5016adb82ec9a29c9f7741cea269484e608;hp=bc8133fda17a428b7bc763e6d366f8044bc834ed;hpb=ad556e8a31763ef0185ba2de5ca9624233518fa0;p=apps%2Fmadmutt.git

diff --git a/lib/list.c b/lib/list.c
index bc8133f..a454c8f 100644
--- a/lib/list.c
+++ b/lib/list.c
@@ -15,31 +15,31 @@
 #include "mem.h"
 
 list2_t* list_new (void) {
-  return (safe_calloc (1, sizeof (list2_t)));
+  return (mem_calloc (1, sizeof (list2_t)));
 }
 
-void list_del (list2_t** l, void (*edel) (void**)) {
+void list_del (list2_t** l, list_del_t* del) {
   size_t i = 0;
   if (!l || !*l)
     return;
-  if (*edel)
+  if (del)
     for (i = 0; i < (*l)->length; i++)
-      edel (&(*l)->data[i]);
-  FREE(&(*l)->data);
-  FREE(l);
+      del (&(*l)->data[i]);
+  mem_free(&(*l)->data);
+  mem_free(l);
 }
 
 void list_push_back (list2_t** l, void* p) {
   if (!*l)
     *l = list_new ();
-  safe_realloc (&(*l)->data, (++(*l)->length)*sizeof(void*));
+  mem_realloc (&(*l)->data, (++(*l)->length)*sizeof(void*));
   (*l)->data[(*l)->length-1] = p;
 }
 
 void list_push_front (list2_t** l, void* p) {
   if (!*l)
     *l = list_new ();
-  safe_realloc (&(*l)->data, (++(*l)->length)*sizeof(void*));
+  mem_realloc (&(*l)->data, (++(*l)->length)*sizeof(void*));
   if ((*l)->length > 1)
     memmove (&(*l)->data[1], &(*l)->data[0], ((*l)->length-1)*sizeof(void*));
   (*l)->data[0] = p;
@@ -50,7 +50,7 @@ void* list_pop_back (list2_t* l) {
   if (list_empty(l))
     return (NULL);
   p = l->data[l->length-1];
-  safe_realloc (&l->data, --(l->length)*sizeof(void*));
+  mem_realloc (&l->data, --(l->length)*sizeof(void*));
   return (p);
 }
 
@@ -60,7 +60,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*));
-  safe_realloc (&l->data, l->length*sizeof(void*));
+  mem_realloc (&l->data, l->length*sizeof(void*));
   return (p);
 }
 
@@ -72,7 +72,7 @@ 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*));
-  safe_realloc (&l->data, (--(l->length))*sizeof(void*));
+  mem_realloc (&l->data, (--(l->length))*sizeof(void*));
   return (p);
 }
 
@@ -82,7 +82,7 @@ list2_t* list_cpy (list2_t* l) {
     return (NULL);
   ret = list_new ();
   ret->length = l->length;
-  ret->data = safe_malloc (l->length*sizeof(void*));
+  ret->data = mem_malloc (l->length*sizeof(void*));
   memcpy (ret->data, l->data, l->length*sizeof(void*));
   return (ret);
 }
@@ -94,13 +94,13 @@ list2_t* list_dup (list2_t* l, void* (*dup) (void*)) {
     return (NULL);
   ret = list_new ();
   ret->length = l->length;
-  ret->data = safe_malloc (l->length*sizeof(void*));
+  ret->data = mem_malloc (l->length*sizeof(void*));
   for (i = 0; i < l->length; i++)
     ret->data[i] = dup (l->data[i]);
   return (ret);
 }
 
-int _list_lookup (list2_t* l, int (*cmp) (const void*, const void*), const void* p) {
+int list_lookup (list2_t* l, int (*cmp) (const void*, const void*), const void* p) {
   int i = 0;
   if (list_empty(l) || !*cmp)
     return (-1);