… | |
… | |
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 <stdio.h> |
25 | #include <stdio.h> |
|
|
26 | #include "general.h" |
26 | #include "list.h" |
27 | #include "list.h" |
27 | #include "error.h" |
28 | #include "error.h" |
28 | |
29 | |
|
|
30 | #ifdef DMALLOC |
|
|
31 | #include <dmalloc.h> |
|
|
32 | #endif |
|
|
33 | |
|
|
34 | |
29 | static int psiconv_list_resize(psiconv_list l,unsigned int nr); |
35 | static int psiconv_list_resize(psiconv_list l,psiconv_u32 nr); |
30 | |
36 | |
31 | struct psiconv_list_s { |
37 | struct psiconv_list_s { |
32 | int cur_len; |
38 | psiconv_u32 cur_len; |
33 | int max_len; |
39 | psiconv_u32 max_len; |
34 | int el_size; |
40 | size_t el_size; |
35 | void *els; |
41 | void *els; |
36 | }; |
42 | }; |
37 | |
43 | |
38 | psiconv_list psiconv_list_new(int element_size) |
44 | psiconv_list psiconv_list_new(size_t element_size) |
39 | { |
45 | { |
40 | psiconv_list l; |
46 | psiconv_list l; |
41 | l = malloc(sizeof(*l)); |
47 | l = malloc(sizeof(*l)); |
42 | if (!l) |
48 | if (!l) |
43 | return NULL; |
49 | return NULL; |
… | |
… | |
50 | |
56 | |
51 | void psiconv_list_free(psiconv_list l) |
57 | void psiconv_list_free(psiconv_list l) |
52 | { |
58 | { |
53 | if (l->max_len) |
59 | if (l->max_len) |
54 | free(l->els); |
60 | free(l->els); |
55 | l->max_len = 0; |
61 | free(l); |
56 | l->cur_len = 0; |
|
|
57 | l->els = NULL; |
62 | l = NULL; |
58 | } |
63 | } |
59 | |
64 | |
60 | 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)) |
61 | { |
66 | { |
62 | psiconv_list_foreach_el(l,free_el); |
67 | psiconv_list_foreach_el(l,free_el); |
63 | psiconv_list_free(l); |
68 | psiconv_list_free(l); |
64 | } |
69 | } |
65 | |
70 | |
66 | int psiconv_list_length(const psiconv_list l) |
71 | psiconv_u32 psiconv_list_length(const psiconv_list l) |
67 | { |
72 | { |
68 | return l->cur_len; |
73 | return l->cur_len; |
69 | } |
74 | } |
70 | |
75 | |
71 | int psiconv_list_is_empty(const psiconv_list l) |
76 | int psiconv_list_is_empty(const psiconv_list l) |
72 | { |
77 | { |
73 | return l->cur_len == 0; |
78 | return l->cur_len == 0; |
74 | } |
79 | } |
75 | |
80 | |
|
|
81 | void psiconv_list_empty(psiconv_list l) |
|
|
82 | { |
|
|
83 | l->cur_len = 0; |
|
|
84 | } |
|
|
85 | |
76 | void *psiconv_list_get(const psiconv_list l, unsigned int indx) |
86 | void *psiconv_list_get(const psiconv_list l, psiconv_u32 indx) |
77 | { |
87 | { |
78 | if (indx >= l->cur_len) |
88 | if (indx >= l->cur_len) |
79 | return NULL; |
89 | return NULL; |
80 | else |
90 | else |
81 | return ((char *) (l->els)) + indx * l->el_size; |
91 | return ((char *) (l->els)) + indx * l->el_size; |
… | |
… | |
89 | 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); |
90 | l->cur_len ++; |
100 | l->cur_len ++; |
91 | return 0; |
101 | return 0; |
92 | } |
102 | } |
93 | |
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; |
|
|
111 | } |
|
|
112 | |
|
|
113 | int 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; |
|
|
119 | } |
|
|
120 | |
94 | void psiconv_list_foreach_el(psiconv_list l, void action(void *el)) |
121 | void psiconv_list_foreach_el(psiconv_list l, void action(void *el)) |
95 | { |
122 | { |
96 | int i; |
123 | psiconv_u32 i; |
97 | for (i = 0; i < l->cur_len; i ++) |
124 | for (i = 0; i < l->cur_len; i ++) |
98 | action(psiconv_list_get(l,i)); |
125 | action(psiconv_list_get(l,i)); |
99 | } |
126 | } |
100 | |
127 | |
101 | psiconv_list psiconv_list_clone(const psiconv_list l) |
128 | psiconv_list psiconv_list_clone(const psiconv_list l) |
102 | { |
129 | { |
103 | psiconv_list l2; |
130 | psiconv_list l2; |
104 | int i; |
131 | psiconv_u32 i; |
105 | l2 = psiconv_list_new(l->el_size); |
132 | l2 = psiconv_list_new(l->el_size); |
106 | if (!l2) |
133 | if (!l2) |
107 | return NULL; |
134 | return NULL; |
108 | for (i = 0; i < l->cur_len; i ++) |
135 | for (i = 0; i < l->cur_len; i ++) |
109 | if (psiconv_list_add(l2,psiconv_list_get(l,i))) { |
136 | if (psiconv_list_add(l2,psiconv_list_get(l,i))) { |
… | |
… | |
116 | |
143 | |
117 | size_t psiconv_list_fread(psiconv_list l,size_t size, FILE *f) |
144 | size_t psiconv_list_fread(psiconv_list l,size_t size, FILE *f) |
118 | { |
145 | { |
119 | size_t res; |
146 | size_t res; |
120 | if (psiconv_list_resize(l,l->cur_len + size)) |
147 | if (psiconv_list_resize(l,l->cur_len + size)) |
121 | return -PSICONV_E_NOMEM; |
148 | return 0; |
122 | res = fread(((char *) (l->els)) + l->cur_len * l->el_size,l->el_size,size,f); |
149 | res = fread(((char *) (l->els)) + l->cur_len * l->el_size,l->el_size,size,f); |
123 | l->cur_len += res; |
150 | l->cur_len += res; |
124 | return res; |
151 | return res; |
125 | } |
152 | } |
126 | |
153 | |
|
|
154 | int psiconv_list_fread_all(psiconv_list l, FILE *f) |
|
|
155 | { |
|
|
156 | while (!feof(f)) { |
|
|
157 | if (!psiconv_list_fread(l,1024,f) && !feof(f)) |
|
|
158 | return -PSICONV_E_NOMEM; |
|
|
159 | } |
|
|
160 | return -PSICONV_E_OK; |
|
|
161 | } |
|
|
162 | |
|
|
163 | int psiconv_list_fwrite_all(const psiconv_list l, FILE *f) |
|
|
164 | { |
|
|
165 | psiconv_u32 pos = 0; |
|
|
166 | psiconv_u32 written; |
|
|
167 | psiconv_u32 len = psiconv_list_length(l); |
|
|
168 | while (pos < len) { |
|
|
169 | if (!(written = fwrite(((char *)(l->els)) + pos * l->el_size,l->el_size, |
|
|
170 | len - pos,f))) |
|
|
171 | return -PSICONV_E_OTHER; |
|
|
172 | pos += written; |
|
|
173 | } |
|
|
174 | return -PSICONV_E_OK; |
|
|
175 | } |
|
|
176 | |
127 | int psiconv_list_resize(psiconv_list l,unsigned int nr) |
177 | int psiconv_list_resize(psiconv_list l,psiconv_u32 nr) |
128 | { |
178 | { |
129 | void * temp; |
179 | void * temp; |
130 | if (nr > l->max_len) { |
180 | if (nr > l->max_len) { |
131 | l->max_len = 1.1 * nr; |
181 | l->max_len = 1.1 * nr; |
132 | l->max_len += 16 - l->max_len % 16; |
182 | l->max_len += 16 - l->max_len % 16; |
133 | temp = realloc(l->els,l->max_len * l->el_size); |
183 | temp = realloc(l->els,l->max_len * l->el_size); |
134 | if (temp) { |
184 | if (temp) { |
135 | l->els = temp; |
185 | l->els = temp; |
136 | return 0; |
186 | return -PSICONV_E_OK; |
137 | } else |
187 | } else |
138 | return -PSICONV_E_NOMEM; |
188 | return -PSICONV_E_NOMEM; |
139 | } |
189 | } |
140 | return 0; |
190 | return -PSICONV_E_OK; |
141 | } |
191 | } |
142 | |
192 | |
143 | int psiconv_list_concat(psiconv_list l, const psiconv_list extra) |
193 | int psiconv_list_concat(psiconv_list l, const psiconv_list extra) |
144 | { |
194 | { |
145 | int res; |
195 | int res; |
|
|
196 | if (l->el_size != extra->el_size) |
|
|
197 | return -PSICONV_E_OTHER; |
146 | if ((res = psiconv_list_resize(l, |
198 | if ((res = psiconv_list_resize(l, |
147 | l->cur_len + extra->cur_len * extra->el_size))) |
199 | l->cur_len + extra->cur_len))) |
148 | return res; |
200 | return res; |
149 | /* Unreadable but correct. */ |
201 | /* Unreadable but correct. */ |
150 | 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, |
151 | extra->cur_len * extra->el_size); |
203 | extra->cur_len * extra->el_size); |
|
|
204 | l->cur_len += extra->cur_len; |
152 | return 0; |
205 | return 0; |
153 | } |
206 | } |
|
|
207 | |
|
|
208 | |