/[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 79 Revision 142
24#include <stdlib.h> 24#include <stdlib.h>
25#include <stdio.h> 25#include <stdio.h>
26#include "general.h" 26#include "general.h"
27#include "list.h" 27#include "list.h"
28#include "error.h" 28#include "error.h"
29
30#ifdef DMALLOC
31#include <dmalloc.h>
32#endif
33
29 34
30static int psiconv_list_resize(psiconv_list l,psiconv_u32 nr); 35static int psiconv_list_resize(psiconv_list l,psiconv_u32 nr);
31 36
32struct psiconv_list_s { 37struct psiconv_list_s {
33 psiconv_u32 cur_len; 38 psiconv_u32 cur_len;
51 56
52void psiconv_list_free(psiconv_list l) 57void psiconv_list_free(psiconv_list l)
53{ 58{
54 if (l->max_len) 59 if (l->max_len)
55 free(l->els); 60 free(l->els);
56 l->max_len = 0; 61 free(l);
57 l->cur_len = 0;
58 l->els = NULL; 62 l = NULL;
59} 63}
60 64
61void psiconv_list_free_el(psiconv_list l, void free_el(void *el)) 65void psiconv_list_free_el(psiconv_list l, void free_el(void *el))
62{ 66{
63 psiconv_list_foreach_el(l,free_el); 67 psiconv_list_foreach_el(l,free_el);
70} 74}
71 75
72int psiconv_list_is_empty(const psiconv_list l) 76int psiconv_list_is_empty(const psiconv_list l)
73{ 77{
74 return l->cur_len == 0; 78 return l->cur_len == 0;
79}
80
81void psiconv_list_empty(psiconv_list l)
82{
83 l->cur_len = 0;
75} 84}
76 85
77void *psiconv_list_get(const psiconv_list l, psiconv_u32 indx) 86void *psiconv_list_get(const psiconv_list l, psiconv_u32 indx)
78{ 87{
79 if (indx >= l->cur_len) 88 if (indx >= l->cur_len)
88 if ((res = psiconv_list_resize(l,l->cur_len + 1))) 97 if ((res = psiconv_list_resize(l,l->cur_len + 1)))
89 return res; 98 return res;
90 memcpy(((char *) (l->els)) + l->cur_len * l->el_size, el, l->el_size); 99 memcpy(((char *) (l->els)) + l->cur_len * l->el_size, el, l->el_size);
91 l->cur_len ++; 100 l->cur_len ++;
92 return 0; 101 return 0;
102}
103
104int psiconv_list_pop(psiconv_list l, void *el)
105{
106 if (! l->cur_len)
107 return -PSICONV_E_OTHER;
108 l->cur_len --;
109 memcpy(el,((char *)(l->els)) + l->cur_len * l->el_size,l->el_size);
110 return -PSICONV_E_OK;
111}
112
113int psiconv_list_replace(psiconv_list l, psiconv_u32 indx, const void *el)
114{
115 if (indx >= l->cur_len)
116 return -PSICONV_E_OTHER;
117 memcpy(((char *) (l->els)) + indx * l->el_size,el, l->el_size);
118 return -PSICONV_E_OK;
93} 119}
94 120
95void psiconv_list_foreach_el(psiconv_list l, void action(void *el)) 121void psiconv_list_foreach_el(psiconv_list l, void action(void *el))
96{ 122{
97 psiconv_u32 i; 123 psiconv_u32 i;
176 memcpy(((char *) (l->els)) + l->cur_len * l->el_size,extra->els, 202 memcpy(((char *) (l->els)) + l->cur_len * l->el_size,extra->els,
177 extra->cur_len * extra->el_size); 203 extra->cur_len * extra->el_size);
178 l->cur_len += extra->cur_len; 204 l->cur_len += extra->cur_len;
179 return 0; 205 return 0;
180} 206}
207
208

Legend:
Removed from v.79  
changed lines
  Added in v.142

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