/[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 72
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 -PSICONV_E_NOMEM;
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;
124} 125}
125 126
137 return -PSICONV_E_NOMEM; 138 return -PSICONV_E_NOMEM;
138 } 139 }
139 return 0; 140 return 0;
140} 141}
141 142
143int psiconv_list_concat(psiconv_list l, const psiconv_list extra)
144{
145 int res;
146 if ((res = psiconv_list_resize(l,
147 l->cur_len + extra->cur_len * extra->el_size)))
148 return res;
149 /* Unreadable but correct. */
150 memcpy(((char *) (l->els)) + l->cur_len * l->el_size,extra->els,
151 extra->cur_len * extra->el_size);
152 return 0;
153}

Legend:
Removed from v.70  
changed lines
  Added in v.72

frodo@frodo.looijaard.name
ViewVC Help
Powered by ViewVC 1.1.26