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