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