list2_t --

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

diff --git a/lib/list.c b/lib/list.c
index efa4c98..0b852e0 100644 (file)
--- a/lib/list.c
+++ b/lib/list.c
@@ -7,22 +7,15 @@
  * please see the file GPL in the top level source directory.
  */
 
-#include <stddef.h>
-#include <string.h>
-
-#include <lib-lib/mem.h>
-
+#include <lib-lib/lib-lib.h>
 #include "list.h"
 
-#include "mem.h"
-#include "str.h"
-
 list2_t* list_new (void) {
   return p_new(list2_t, 1);
 }
 
 void list_del (list2_t** l, list_del_t* del) {
-  size_t i = 0;
+  ssize_t i = 0;
   if (!l || !*l)
     return;
   if (del)
@@ -35,14 +28,14 @@ void list_del (list2_t** l, list_del_t* del) {
 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;
@@ -53,7 +46,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);
 }
 
@@ -63,7 +56,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);
 }
 
@@ -75,7 +68,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*));
-  mem_realloc (&l->data, (--(l->length))*sizeof(void*));
+  p_realloc(&l->data, --(l->length));
   return (p);
 }
 
@@ -89,16 +82,16 @@ list2_t *list_cpy(list2_t *l) {
     return ret;
 }
 
-list2_t* list_dup (list2_t* l, void* (*dup) (void*)) {
+list2_t* list_dup (list2_t* l, void* (*dup_f) (void*)) {
   list2_t* ret = NULL;
   int i = 0;
-  if (list_empty(l) || !*dup)
+  if (list_empty(l) || !*dup_f)
     return (NULL);
   ret = list_new ();
   ret->length = l->length;
   ret->data = p_new(void*, l->length);
   for (i = 0; i < l->length; i++)
-    ret->data[i] = dup (l->data[i]);
+    ret->data[i] = dup_f (l->data[i]);
   return (ret);
 }
 
@@ -119,9 +112,9 @@ list2_t* list_from_str (const char* str, const char* delim) {
   if (!str || !*str || !delim || !*delim)
     return (NULL);
 
-  tmp = str_dup (str);
+  tmp = m_strdup(str);
   for (p = strtok (tmp, delim); p; p = strtok (NULL, delim)) {
-    list_push_back (&ret, str_dup (p));
+    list_push_back (&ret, m_strdup(p));
   }
   p_delete(&tmp);
   return (ret);