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

Legend:
Removed from v.70  
changed lines
  Added in v.141

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