/[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 2 Revision 142
1/* 1/*
2 list.c - Part of psiconv, a PSION 5 file formats converter 2 list.c - Part of psiconv, a PSION 5 file formats converter
3 Copyright (c) 1999 Frodo Looijaard <frodol@dds.nl> 3 Copyright (c) 1999, 2000 Frodo Looijaard <frodol@dds.nl>
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
… …
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>
26#include "general.h"
25#include "list.h" 27#include "list.h"
28#include "error.h"
26 29
30#ifdef DMALLOC
31#include <dmalloc.h>
32#endif
33
34
27static void psiconv_list_resize(psiconv_list l,unsigned int nr); 35static int psiconv_list_resize(psiconv_list l,psiconv_u32 nr);
28 36
29struct psiconv_list { 37struct psiconv_list_s {
30 int cur_len; 38 psiconv_u32 cur_len;
31 int max_len; 39 psiconv_u32 max_len;
32 int el_size; 40 size_t el_size;
33 void *els; 41 void *els;
34}; 42};
35 43
36psiconv_list psiconv_list_new(int element_size) 44psiconv_list psiconv_list_new(size_t element_size)
37{ 45{
38 psiconv_list l; 46 psiconv_list l;
39 l = malloc(sizeof(*l)); 47 l = malloc(sizeof(*l));
48 if (!l)
49 return NULL;
40 l->cur_len = 0; 50 l->cur_len = 0;
41 l->max_len = 0; 51 l->max_len = 0;
42 l->el_size=element_size; 52 l->el_size=element_size;
43 l->els = NULL; 53 l->els = NULL;
44 return l; 54 return l;
… …
46 56
47void psiconv_list_free(psiconv_list l) 57void psiconv_list_free(psiconv_list l)
48{ 58{
49 if (l->max_len) 59 if (l->max_len)
50 free(l->els); 60 free(l->els);
51 l->max_len = 0; 61 free(l);
52 l->cur_len = 0;
53 l->els = NULL; 62 l = NULL;
54} 63}
55 64
56void psiconv_list_free_el(psiconv_list l, void free_el(void *el)) 65void psiconv_list_free_el(psiconv_list l, void free_el(void *el))
57{ 66{
58 psiconv_list_foreach_el(l,free_el); 67 psiconv_list_foreach_el(l,free_el);
59 psiconv_list_free(l); 68 psiconv_list_free(l);
60} 69}
61 70
62int psiconv_list_length(const psiconv_list l) 71psiconv_u32 psiconv_list_length(const psiconv_list l)
63{ 72{
64 return l->cur_len; 73 return l->cur_len;
65} 74}
66 75
67int psiconv_list_is_empty(const psiconv_list l) 76int psiconv_list_is_empty(const psiconv_list l)
68{ 77{
69 return l->cur_len == 0; 78 return l->cur_len == 0;
70} 79}
71 80
81void psiconv_list_empty(psiconv_list l)
82{
83 l->cur_len = 0;
84}
85
72void *psiconv_list_get(const psiconv_list l, unsigned int indx) 86void *psiconv_list_get(const psiconv_list l, psiconv_u32 indx)
73{ 87{
74 if (indx >= l->cur_len) 88 if (indx >= l->cur_len)
75 return NULL; 89 return NULL;
76 else 90 else
77 return ((char *) (l->els)) + indx * l->el_size; 91 return ((char *) (l->els)) + indx * l->el_size;
78} 92}
79 93
80void psiconv_list_add(psiconv_list l, void *el) 94int psiconv_list_add(psiconv_list l, const void *el)
81{ 95{
96 int res;
82 psiconv_list_resize(l,l->cur_len + 1); 97 if ((res = psiconv_list_resize(l,l->cur_len + 1)))
98 return res;
83 memcpy(((char *) (l->els)) + l->cur_len * l->el_size, el, l->el_size); 99 memcpy(((char *) (l->els)) + l->cur_len * l->el_size, el, l->el_size);
84 l->cur_len ++; 100 l->cur_len ++;
101 return 0;
102}
103
104int psiconv_list_pop(psiconv_list l, void *el)
105{
106 if (! l->cur_len)
107 return -PSICONV_E_OTHER;
108 l->cur_len --;
109 memcpy(el,((char *)(l->els)) + l->cur_len * l->el_size,l->el_size);
110 return -PSICONV_E_OK;
111}
112
113int psiconv_list_replace(psiconv_list l, psiconv_u32 indx, const void *el)
114{
115 if (indx >= l->cur_len)
116 return -PSICONV_E_OTHER;
117 memcpy(((char *) (l->els)) + indx * l->el_size,el, l->el_size);
118 return -PSICONV_E_OK;
85} 119}
86 120
87void psiconv_list_foreach_el(psiconv_list l, void action(void *el)) 121void psiconv_list_foreach_el(psiconv_list l, void action(void *el))
88{ 122{
89 int i; 123 psiconv_u32 i;
90 for (i = 0; i < l->cur_len; i ++) 124 for (i = 0; i < l->cur_len; i ++)
91 action(psiconv_list_get(l,i)); 125 action(psiconv_list_get(l,i));
92} 126}
93 127
94psiconv_list psiconv_list_clone(const psiconv_list l) 128psiconv_list psiconv_list_clone(const psiconv_list l)
95{ 129{
96 psiconv_list l2; 130 psiconv_list l2;
97 int i; 131 psiconv_u32 i;
98 l2 = psiconv_list_new(l->el_size); 132 l2 = psiconv_list_new(l->el_size);
133 if (!l2)
134 return NULL;
99 for (i = 0; i < l->cur_len; i ++) 135 for (i = 0; i < l->cur_len; i ++)
100 psiconv_list_add(l2,psiconv_list_get(l,i)); 136 if (psiconv_list_add(l2,psiconv_list_get(l,i))) {
137 psiconv_list_free(l2);
138 return NULL;
139 }
101 return l2; 140 return l2;
102 141
103} 142}
104 143
105psiconv_list psiconv_list_clone_el(const psiconv_list l,void clone_el(void *el))
106{
107 psiconv_list l2 = psiconv_list_clone(l);
108 psiconv_list_foreach_el(l2,clone_el);
109 return l2;
110}
111
112size_t psiconv_list_fread(psiconv_list l,size_t size, FILE *f) 144size_t psiconv_list_fread(psiconv_list l,size_t size, FILE *f)
113{ 145{
114 size_t res; 146 size_t res;
115 psiconv_list_resize(l,l->cur_len + size); 147 if (psiconv_list_resize(l,l->cur_len + size))
148 return 0;
116 res = fread(((char *) (l->els)) + l->cur_len * l->el_size,l->el_size,size,f); 149 res = fread(((char *) (l->els)) + l->cur_len * l->el_size,l->el_size,size,f);
117 l->cur_len += res; 150 l->cur_len += res;
118 return res; 151 return res;
119} 152}
120 153
154int psiconv_list_fread_all(psiconv_list l, FILE *f)
155{
156 while (!feof(f)) {
157 if (!psiconv_list_fread(l,1024,f) && !feof(f))
158 return -PSICONV_E_NOMEM;
159 }
160 return -PSICONV_E_OK;
161}
162
163int psiconv_list_fwrite_all(const psiconv_list l, FILE *f)
164{
165 psiconv_u32 pos = 0;
166 psiconv_u32 written;
167 psiconv_u32 len = psiconv_list_length(l);
168 while (pos < len) {
169 if (!(written = fwrite(((char *)(l->els)) + pos * l->el_size,l->el_size,
170 len - pos,f)))
171 return -PSICONV_E_OTHER;
172 pos += written;
173 }
174 return -PSICONV_E_OK;
175}
176
121void psiconv_list_resize(psiconv_list l,unsigned int nr) 177int psiconv_list_resize(psiconv_list l,psiconv_u32 nr)
122{ 178{
179 void * temp;
123 if (nr > l->max_len) { 180 if (nr > l->max_len) {
124 l->max_len = 1.1 * nr; 181 l->max_len = 1.1 * nr;
125 l->max_len += 16 - l->max_len % 16; 182 l->max_len += 16 - l->max_len % 16;
126 l->els = realloc(l->els,l->max_len * l->el_size); 183 temp = realloc(l->els,l->max_len * l->el_size);
184 if (temp) {
185 l->els = temp;
186 return -PSICONV_E_OK;
187 } else
188 return -PSICONV_E_NOMEM;
127 } 189 }
190 return -PSICONV_E_OK;
128} 191}
129 192
193int psiconv_list_concat(psiconv_list l, const psiconv_list extra)
194{
195 int res;
196 if (l->el_size != extra->el_size)
197 return -PSICONV_E_OTHER;
198 if ((res = psiconv_list_resize(l,
199 l->cur_len + extra->cur_len)))
200 return res;
201 /* Unreadable but correct. */
202 memcpy(((char *) (l->els)) + l->cur_len * l->el_size,extra->els,
203 extra->cur_len * extra->el_size);
204 l->cur_len += extra->cur_len;
205 return 0;
206}
207
208
Legend:
Removed from v.2  
changed lines
  Added in v.142
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26