/[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 71 Revision 80
… …
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;
… …
61{ 62{
62 psiconv_list_foreach_el(l,free_el); 63 psiconv_list_foreach_el(l,free_el);
63 psiconv_list_free(l); 64 psiconv_list_free(l);
64} 65}
65 66
66int psiconv_list_length(const psiconv_list l) 67psiconv_u32 psiconv_list_length(const psiconv_list l)
67{ 68{
68 return l->cur_len; 69 return l->cur_len;
69} 70}
70 71
71int psiconv_list_is_empty(const psiconv_list l) 72int psiconv_list_is_empty(const psiconv_list l)
72{ 73{
73 return l->cur_len == 0; 74 return l->cur_len == 0;
74} 75}
75 76
77void psiconv_list_empty(psiconv_list l)
78{
79 l->cur_len = 0;
80}
81
76void *psiconv_list_get(const psiconv_list l, unsigned int indx) 82void *psiconv_list_get(const psiconv_list l, psiconv_u32 indx)
77{ 83{
78 if (indx >= l->cur_len) 84 if (indx >= l->cur_len)
79 return NULL; 85 return NULL;
80 else 86 else
81 return ((char *) (l->els)) + indx * l->el_size; 87 return ((char *) (l->els)) + indx * l->el_size;
82} 88}
83 89
84int psiconv_list_add(psiconv_list l, const void *el) 90int psiconv_list_add(psiconv_list l, const void *el)
85{ 91{
92 int res;
86 if (psiconv_list_resize(l,l->cur_len + 1)) 93 if ((res = psiconv_list_resize(l,l->cur_len + 1)))
87 return -PSICONV_E_NOMEM; 94 return res;
88 memcpy(((char *) (l->els)) + l->cur_len * l->el_size, el, l->el_size); 95 memcpy(((char *) (l->els)) + l->cur_len * l->el_size, el, l->el_size);
89 l->cur_len ++; 96 l->cur_len ++;
90 return 0; 97 return 0;
91} 98}
92 99
100int psiconv_list_replace(psiconv_list l, psiconv_u32 indx, const void *el)
101{
102 if (indx >= l->cur_len)
103 return -PSICONV_E_OTHER;
104 memcpy(((char *) (l->els)) + indx * l->el_size,el, l->el_size);
105 return -PSICONV_E_OK;
106}
107
93void psiconv_list_foreach_el(psiconv_list l, void action(void *el)) 108void psiconv_list_foreach_el(psiconv_list l, void action(void *el))
94{ 109{
95 int i; 110 psiconv_u32 i;
96 for (i = 0; i < l->cur_len; i ++) 111 for (i = 0; i < l->cur_len; i ++)
97 action(psiconv_list_get(l,i)); 112 action(psiconv_list_get(l,i));
98} 113}
99 114
100psiconv_list psiconv_list_clone(const psiconv_list l) 115psiconv_list psiconv_list_clone(const psiconv_list l)
101{ 116{
102 psiconv_list l2; 117 psiconv_list l2;
103 int i; 118 psiconv_u32 i;
104 l2 = psiconv_list_new(l->el_size); 119 l2 = psiconv_list_new(l->el_size);
105 if (!l2) 120 if (!l2)
106 return NULL; 121 return NULL;
107 for (i = 0; i < l->cur_len; i ++) 122 for (i = 0; i < l->cur_len; i ++)
108 if (psiconv_list_add(l2,psiconv_list_get(l,i))) { 123 if (psiconv_list_add(l2,psiconv_list_get(l,i))) {
… …
111 } 126 }
112 return l2; 127 return l2;
113 128
114} 129}
115 130
116
117size_t psiconv_list_fread(psiconv_list l,size_t size, FILE *f) 131size_t psiconv_list_fread(psiconv_list l,size_t size, FILE *f)
118{ 132{
119 size_t res; 133 size_t res;
120 if (psiconv_list_resize(l,l->cur_len + size)) 134 if (psiconv_list_resize(l,l->cur_len + size))
121 return 0; 135 return 0;
122 res = fread(((char *) (l->els)) + l->cur_len * l->el_size,l->el_size,size,f); 136 res = fread(((char *) (l->els)) + l->cur_len * l->el_size,l->el_size,size,f);
123 l->cur_len += res; 137 l->cur_len += res;
124 return res; 138 return res;
125} 139}
126 140
141int psiconv_list_fread_all(psiconv_list l, FILE *f)
142{
143 while (!feof(f)) {
144 if (!psiconv_list_fread(l,1024,f) && !feof(f))
145 return -PSICONV_E_NOMEM;
146 }
147 return -PSICONV_E_OK;
148}
149
150int psiconv_list_fwrite_all(const psiconv_list l, FILE *f)
151{
152 psiconv_u32 pos = 0;
153 psiconv_u32 written;
154 psiconv_u32 len = psiconv_list_length(l);
155 while (pos < len) {
156 if (!(written = fwrite(((char *)(l->els)) + pos * l->el_size,l->el_size,
157 len - pos,f)))
158 return -PSICONV_E_OTHER;
159 pos += written;
160 }
161 return -PSICONV_E_OK;
162}
163
127int psiconv_list_resize(psiconv_list l,unsigned int nr) 164int psiconv_list_resize(psiconv_list l,psiconv_u32 nr)
128{ 165{
129 void * temp; 166 void * temp;
130 if (nr > l->max_len) { 167 if (nr > l->max_len) {
131 l->max_len = 1.1 * nr; 168 l->max_len = 1.1 * nr;
132 l->max_len += 16 - l->max_len % 16; 169 l->max_len += 16 - l->max_len % 16;
133 temp = realloc(l->els,l->max_len * l->el_size); 170 temp = realloc(l->els,l->max_len * l->el_size);
134 if (temp) { 171 if (temp) {
135 l->els = temp; 172 l->els = temp;
136 return 0; 173 return -PSICONV_E_OK;
137 } else 174 } else
138 return -PSICONV_E_NOMEM; 175 return -PSICONV_E_NOMEM;
139 } 176 }
177 return -PSICONV_E_OK;
178}
179
180int psiconv_list_concat(psiconv_list l, const psiconv_list extra)
181{
182 int res;
183 if (l->el_size != extra->el_size)
184 return -PSICONV_E_OTHER;
185 if ((res = psiconv_list_resize(l,
186 l->cur_len + extra->cur_len)))
187 return res;
188 /* Unreadable but correct. */
189 memcpy(((char *) (l->els)) + l->cur_len * l->el_size,extra->els,
190 extra->cur_len * extra->el_size);
191 l->cur_len += extra->cur_len;
140 return 0; 192 return 0;
141} 193}
142 194
195
Legend:
Removed from v.71  
changed lines
  Added in v.80
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26