/[public]/psiconv/trunk/lib/psiconv/list.c
ViewVC logotype

Diff of /psiconv/trunk/lib/psiconv/list.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 80 Revision 168
20 20
21#include "config.h" 21#include "config.h"
22#include "compat.h" 22#include "compat.h"
23#include <stddef.h> 23#include <stddef.h>
24#include <stdlib.h> 24#include <stdlib.h>
25#include <string.h>
25#include <stdio.h> 26#include <stdio.h>
26#include "general.h" 27#include "general.h"
27#include "list.h" 28#include "list.h"
28#include "error.h" 29#include "error.h"
30
31#ifdef DMALLOC
32#include <dmalloc.h>
33#endif
34
29 35
30static int psiconv_list_resize(psiconv_list l,psiconv_u32 nr); 36static int psiconv_list_resize(psiconv_list l,psiconv_u32 nr);
31 37
32struct psiconv_list_s { 38struct psiconv_list_s {
33 psiconv_u32 cur_len; 39 psiconv_u32 cur_len;
51 57
52void psiconv_list_free(psiconv_list l) 58void psiconv_list_free(psiconv_list l)
53{ 59{
54 if (l->max_len) 60 if (l->max_len)
55 free(l->els); 61 free(l->els);
56 l->max_len = 0; 62 free(l);
57 l->cur_len = 0;
58 l->els = NULL; 63 l = NULL;
59} 64}
60 65
61void psiconv_list_free_el(psiconv_list l, void free_el(void *el)) 66void psiconv_list_free_el(psiconv_list l, void free_el(void *el))
62{ 67{
63 psiconv_list_foreach_el(l,free_el); 68 psiconv_list_foreach_el(l,free_el);
93 if ((res = psiconv_list_resize(l,l->cur_len + 1))) 98 if ((res = psiconv_list_resize(l,l->cur_len + 1)))
94 return res; 99 return res;
95 memcpy(((char *) (l->els)) + l->cur_len * l->el_size, el, l->el_size); 100 memcpy(((char *) (l->els)) + l->cur_len * l->el_size, el, l->el_size);
96 l->cur_len ++; 101 l->cur_len ++;
97 return 0; 102 return 0;
103}
104
105int psiconv_list_pop(psiconv_list l, void *el)
106{
107 if (! l->cur_len)
108 return -PSICONV_E_OTHER;
109 l->cur_len --;
110 memcpy(el,((char *)(l->els)) + l->cur_len * l->el_size,l->el_size);
111 return -PSICONV_E_OK;
98} 112}
99 113
100int psiconv_list_replace(psiconv_list l, psiconv_u32 indx, const void *el) 114int psiconv_list_replace(psiconv_list l, psiconv_u32 indx, const void *el)
101{ 115{
102 if (indx >= l->cur_len) 116 if (indx >= l->cur_len)

Legend:
Removed from v.80  
changed lines
  Added in v.168

frodo@frodo.looijaard.name
ViewVC Help
Powered by ViewVC 1.1.26