… | |
… | |
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 | |
30 | static int psiconv_list_resize(psiconv_list l,psiconv_u32 nr); |
36 | static int psiconv_list_resize(psiconv_list l,psiconv_u32 nr); |
31 | |
37 | |
32 | struct psiconv_list_s { |
38 | struct psiconv_list_s { |
33 | psiconv_u32 cur_len; |
39 | psiconv_u32 cur_len; |
… | |
… | |
51 | |
57 | |
52 | void psiconv_list_free(psiconv_list l) |
58 | void 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 | |
61 | void psiconv_list_free_el(psiconv_list l, void free_el(void *el)) |
66 | void 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); |
… | |
… | |
70 | } |
75 | } |
71 | |
76 | |
72 | int psiconv_list_is_empty(const psiconv_list l) |
77 | int psiconv_list_is_empty(const psiconv_list l) |
73 | { |
78 | { |
74 | return l->cur_len == 0; |
79 | return l->cur_len == 0; |
|
|
80 | } |
|
|
81 | |
|
|
82 | void psiconv_list_empty(psiconv_list l) |
|
|
83 | { |
|
|
84 | l->cur_len = 0; |
75 | } |
85 | } |
76 | |
86 | |
77 | void *psiconv_list_get(const psiconv_list l, psiconv_u32 indx) |
87 | void *psiconv_list_get(const psiconv_list l, psiconv_u32 indx) |
78 | { |
88 | { |
79 | if (indx >= l->cur_len) |
89 | if (indx >= l->cur_len) |
… | |
… | |
88 | if ((res = psiconv_list_resize(l,l->cur_len + 1))) |
98 | if ((res = psiconv_list_resize(l,l->cur_len + 1))) |
89 | return res; |
99 | return res; |
90 | 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); |
91 | l->cur_len ++; |
101 | l->cur_len ++; |
92 | return 0; |
102 | return 0; |
|
|
103 | } |
|
|
104 | |
|
|
105 | int 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; |
|
|
112 | } |
|
|
113 | |
|
|
114 | int psiconv_list_replace(psiconv_list l, psiconv_u32 indx, const void *el) |
|
|
115 | { |
|
|
116 | if (indx >= l->cur_len) |
|
|
117 | return -PSICONV_E_OTHER; |
|
|
118 | memcpy(((char *) (l->els)) + indx * l->el_size,el, l->el_size); |
|
|
119 | return -PSICONV_E_OK; |
93 | } |
120 | } |
94 | |
121 | |
95 | void psiconv_list_foreach_el(psiconv_list l, void action(void *el)) |
122 | void psiconv_list_foreach_el(psiconv_list l, void action(void *el)) |
96 | { |
123 | { |
97 | psiconv_u32 i; |
124 | psiconv_u32 i; |
… | |
… | |
176 | memcpy(((char *) (l->els)) + l->cur_len * l->el_size,extra->els, |
203 | memcpy(((char *) (l->els)) + l->cur_len * l->el_size,extra->els, |
177 | extra->cur_len * extra->el_size); |
204 | extra->cur_len * extra->el_size); |
178 | l->cur_len += extra->cur_len; |
205 | l->cur_len += extra->cur_len; |
179 | return 0; |
206 | return 0; |
180 | } |
207 | } |
|
|
208 | |
|
|
209 | |