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