/[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 74 Revision 142
… …
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
29static int psiconv_list_resize(psiconv_list l,unsigned int nr); 35static int psiconv_list_resize(psiconv_list l,psiconv_u32 nr);
30 36
31struct psiconv_list_s { 37struct 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
38psiconv_list psiconv_list_new(int element_size) 44psiconv_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
51void psiconv_list_free(psiconv_list l) 57void 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
60void 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))
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
66int psiconv_list_length(const psiconv_list l) 71psiconv_u32 psiconv_list_length(const psiconv_list l)
67{ 72{
68 return l->cur_len; 73 return l->cur_len;
69} 74}
70 75
71int psiconv_list_is_empty(const psiconv_list l) 76int 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
81void psiconv_list_empty(psiconv_list l)
82{
83 l->cur_len = 0;
84}
85
76void *psiconv_list_get(const psiconv_list l, unsigned int indx) 86void *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
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;
119}
120
94void psiconv_list_foreach_el(psiconv_list l, void action(void *el)) 121void 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
101psiconv_list psiconv_list_clone(const psiconv_list l) 128psiconv_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))) {
… …
125} 152}
126 153
127int psiconv_list_fread_all(psiconv_list l, FILE *f) 154int psiconv_list_fread_all(psiconv_list l, FILE *f)
128{ 155{
129 while (!feof(f)) { 156 while (!feof(f)) {
130 if (!psiconv_list_fread(l,1024,f)) 157 if (!psiconv_list_fread(l,1024,f) && !feof(f))
131 return -PSICONV_E_NOMEM; 158 return -PSICONV_E_NOMEM;
132 } 159 }
133 return -PSICONV_E_OK; 160 return -PSICONV_E_OK;
134} 161}
135 162
136int psiconv_list_fwrite_all(const psiconv_list l, FILE *f) 163int psiconv_list_fwrite_all(const psiconv_list l, FILE *f)
137{ 164{
138 int pos = 0; 165 psiconv_u32 pos = 0;
139 int written; 166 psiconv_u32 written;
140 int len = psiconv_list_length(l); 167 psiconv_u32 len = psiconv_list_length(l);
141 while (pos < len) { 168 while (pos < len) {
142 if (!(written = fwrite(((char *)(l->els)) + pos * l->el_size,l->el_size, 169 if (!(written = fwrite(((char *)(l->els)) + pos * l->el_size,l->el_size,
143 len - pos,f))) 170 len - pos,f)))
144 return -PSICONV_E_OTHER; 171 return -PSICONV_E_OTHER;
145 pos += written; 172 pos += written;
146 } 173 }
147 return -PSICONV_E_OK; 174 return -PSICONV_E_OK;
148} 175}
149 176
150int psiconv_list_resize(psiconv_list l,unsigned int nr) 177int psiconv_list_resize(psiconv_list l,psiconv_u32 nr)
151{ 178{
152 void * temp; 179 void * temp;
153 if (nr > l->max_len) { 180 if (nr > l->max_len) {
154 l->max_len = 1.1 * nr; 181 l->max_len = 1.1 * nr;
155 l->max_len += 16 - l->max_len % 16; 182 l->max_len += 16 - l->max_len % 16;
156 temp = realloc(l->els,l->max_len * l->el_size); 183 temp = realloc(l->els,l->max_len * l->el_size);
157 if (temp) { 184 if (temp) {
158 l->els = temp; 185 l->els = temp;
159 return 0; 186 return -PSICONV_E_OK;
160 } else 187 } else
161 return -PSICONV_E_NOMEM; 188 return -PSICONV_E_NOMEM;
162 } 189 }
163 return 0; 190 return -PSICONV_E_OK;
164} 191}
165 192
166int psiconv_list_concat(psiconv_list l, const psiconv_list extra) 193int psiconv_list_concat(psiconv_list l, const psiconv_list extra)
167{ 194{
168 int res; 195 int res;
196 if (l->el_size != extra->el_size)
197 return -PSICONV_E_OTHER;
169 if ((res = psiconv_list_resize(l, 198 if ((res = psiconv_list_resize(l,
170 l->cur_len + extra->cur_len * extra->el_size))) 199 l->cur_len + extra->cur_len)))
171 return res; 200 return res;
172 /* Unreadable but correct. */ 201 /* Unreadable but correct. */
173 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,
174 extra->cur_len * extra->el_size); 203 extra->cur_len * extra->el_size);
204 l->cur_len += extra->cur_len;
175 return 0; 205 return 0;
176} 206}
207
208
Legend:
Removed from v.74  
changed lines
  Added in v.142
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26