… | |
… | |
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 | |
30 | static int psiconv_list_resize(psiconv_list l,psiconv_u32 nr); |
35 | static int psiconv_list_resize(psiconv_list l,psiconv_u32 nr); |
31 | |
36 | |
32 | struct psiconv_list_s { |
37 | struct psiconv_list_s { |
33 | psiconv_u32 cur_len; |
38 | psiconv_u32 cur_len; |
… | |
… | |
51 | |
56 | |
52 | void psiconv_list_free(psiconv_list l) |
57 | void 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 | |
61 | void psiconv_list_free_el(psiconv_list l, void free_el(void *el)) |
65 | void 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); |
… | |
… | |
93 | if ((res = psiconv_list_resize(l,l->cur_len + 1))) |
97 | if ((res = psiconv_list_resize(l,l->cur_len + 1))) |
94 | return res; |
98 | return res; |
95 | 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); |
96 | l->cur_len ++; |
100 | l->cur_len ++; |
97 | return 0; |
101 | return 0; |
|
|
102 | } |
|
|
103 | |
|
|
104 | int 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; |
98 | } |
111 | } |
99 | |
112 | |
100 | int psiconv_list_replace(psiconv_list l, psiconv_u32 indx, const void *el) |
113 | int psiconv_list_replace(psiconv_list l, psiconv_u32 indx, const void *el) |
101 | { |
114 | { |
102 | if (indx >= l->cur_len) |
115 | if (indx >= l->cur_len) |