/[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 72 Revision 141
… …
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
29static int psiconv_list_resize(psiconv_list l,unsigned int nr); 30static int psiconv_list_resize(psiconv_list l,psiconv_u32 nr);
30 31
31struct psiconv_list_s { 32struct psiconv_list_s {
32 int cur_len; 33 psiconv_u32 cur_len;
33 int max_len; 34 psiconv_u32 max_len;
34 int el_size; 35 size_t el_size;
35 void *els; 36 void *els;
36}; 37};
37 38
38psiconv_list psiconv_list_new(int element_size) 39psiconv_list psiconv_list_new(size_t element_size)
39{ 40{
40 psiconv_list l; 41 psiconv_list l;
41 l = malloc(sizeof(*l)); 42 l = malloc(sizeof(*l));
42 if (!l) 43 if (!l)
43 return NULL; 44 return NULL;
… …
50 51
51void psiconv_list_free(psiconv_list l) 52void psiconv_list_free(psiconv_list l)
52{ 53{
53 if (l->max_len) 54 if (l->max_len)
54 free(l->els); 55 free(l->els);
55 l->max_len = 0; 56 free(l);
56 l->cur_len = 0;
57 l->els = NULL; 57 l = NULL;
58} 58}
59 59
60void 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))
61{ 61{
62 psiconv_list_foreach_el(l,free_el); 62 psiconv_list_foreach_el(l,free_el);
63 psiconv_list_free(l); 63 psiconv_list_free(l);
64} 64}
65 65
66int psiconv_list_length(const psiconv_list l) 66psiconv_u32 psiconv_list_length(const psiconv_list l)
67{ 67{
68 return l->cur_len; 68 return l->cur_len;
69} 69}
70 70
71int psiconv_list_is_empty(const psiconv_list l) 71int psiconv_list_is_empty(const psiconv_list l)
72{ 72{
73 return l->cur_len == 0; 73 return l->cur_len == 0;
74} 74}
75 75
76void psiconv_list_empty(psiconv_list l)
77{
78 l->cur_len = 0;
79}
80
76void *psiconv_list_get(const psiconv_list l, unsigned int indx) 81void *psiconv_list_get(const psiconv_list l, psiconv_u32 indx)
77{ 82{
78 if (indx >= l->cur_len) 83 if (indx >= l->cur_len)
79 return NULL; 84 return NULL;
80 else 85 else
81 return ((char *) (l->els)) + indx * l->el_size; 86 return ((char *) (l->els)) + indx * l->el_size;
… …
89 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);
90 l->cur_len ++; 95 l->cur_len ++;
91 return 0; 96 return 0;
92} 97}
93 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
94void psiconv_list_foreach_el(psiconv_list l, void action(void *el)) 116void psiconv_list_foreach_el(psiconv_list l, void action(void *el))
95{ 117{
96 int i; 118 psiconv_u32 i;
97 for (i = 0; i < l->cur_len; i ++) 119 for (i = 0; i < l->cur_len; i ++)
98 action(psiconv_list_get(l,i)); 120 action(psiconv_list_get(l,i));
99} 121}
100 122
101psiconv_list psiconv_list_clone(const psiconv_list l) 123psiconv_list psiconv_list_clone(const psiconv_list l)
102{ 124{
103 psiconv_list l2; 125 psiconv_list l2;
104 int i; 126 psiconv_u32 i;
105 l2 = psiconv_list_new(l->el_size); 127 l2 = psiconv_list_new(l->el_size);
106 if (!l2) 128 if (!l2)
107 return NULL; 129 return NULL;
108 for (i = 0; i < l->cur_len; i ++) 130 for (i = 0; i < l->cur_len; i ++)
109 if (psiconv_list_add(l2,psiconv_list_get(l,i))) { 131 if (psiconv_list_add(l2,psiconv_list_get(l,i))) {
… …
116 138
117size_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)
118{ 140{
119 size_t res; 141 size_t res;
120 if (psiconv_list_resize(l,l->cur_len + size)) 142 if (psiconv_list_resize(l,l->cur_len + size))
121 return -PSICONV_E_NOMEM; 143 return 0;
122 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);
123 l->cur_len += res; 145 l->cur_len += res;
124 return res; 146 return res;
125} 147}
126 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
127int psiconv_list_resize(psiconv_list l,unsigned int nr) 172int psiconv_list_resize(psiconv_list l,psiconv_u32 nr)
128{ 173{
129 void * temp; 174 void * temp;
130 if (nr > l->max_len) { 175 if (nr > l->max_len) {
131 l->max_len = 1.1 * nr; 176 l->max_len = 1.1 * nr;
132 l->max_len += 16 - l->max_len % 16; 177 l->max_len += 16 - l->max_len % 16;
133 temp = realloc(l->els,l->max_len * l->el_size); 178 temp = realloc(l->els,l->max_len * l->el_size);
134 if (temp) { 179 if (temp) {
135 l->els = temp; 180 l->els = temp;
136 return 0; 181 return -PSICONV_E_OK;
137 } else 182 } else
138 return -PSICONV_E_NOMEM; 183 return -PSICONV_E_NOMEM;
139 } 184 }
140 return 0; 185 return -PSICONV_E_OK;
141} 186}
142 187
143int psiconv_list_concat(psiconv_list l, const psiconv_list extra) 188int psiconv_list_concat(psiconv_list l, const psiconv_list extra)
144{ 189{
145 int res; 190 int res;
191 if (l->el_size != extra->el_size)
192 return -PSICONV_E_OTHER;
146 if ((res = psiconv_list_resize(l, 193 if ((res = psiconv_list_resize(l,
147 l->cur_len + extra->cur_len * extra->el_size))) 194 l->cur_len + extra->cur_len)))
148 return res; 195 return res;
149 /* Unreadable but correct. */ 196 /* Unreadable but correct. */
150 memcpy(((char *) (l->els)) + l->cur_len * l->el_size,extra->els, 197 memcpy(((char *) (l->els)) + l->cur_len * l->el_size,extra->els,
151 extra->cur_len * extra->el_size); 198 extra->cur_len * extra->el_size);
199 l->cur_len += extra->cur_len;
152 return 0; 200 return 0;
153} 201}
202
203
Legend:
Removed from v.72  
changed lines
  Added in v.141
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26