X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib%2Flist.c;h=23dcf2682cf709e45fcea525591029ddb538f81e;hb=b21e95b6f27174909ff28e8e95c13bec01e87f28;hp=efa4c98b73bacd51b7e7f6bd95823596473b5674;hpb=b3cb6ed8d36c550a2e589910ce51bbc8352ff57c;p=apps%2Fmadmutt.git diff --git a/lib/list.c b/lib/list.c index efa4c98..23dcf26 100644 --- a/lib/list.c +++ b/lib/list.c @@ -14,7 +14,6 @@ #include "list.h" -#include "mem.h" #include "str.h" list2_t* list_new (void) { @@ -35,14 +34,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 +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); } @@ -63,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); } @@ -75,7 +74,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); }