/[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 141
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
27static void psiconv_list_resize(psiconv_list l,unsigned int nr); 30static int psiconv_list_resize(psiconv_list l,psiconv_u32 nr);
28 31
29struct psiconv_list { 32struct psiconv_list_s {
30 int cur_len; 33 psiconv_u32 cur_len;
31 int max_len; 34 psiconv_u32 max_len;
32 int el_size; 35 size_t el_size;
33 void *els; 36 void *els;
34}; 37};
35 38
36psiconv_list psiconv_list_new(int element_size) 39psiconv_list psiconv_list_new(size_t element_size)
37{ 40{
38 psiconv_list l; 41 psiconv_list l;
39 l = malloc(sizeof(*l)); 42 l = malloc(sizeof(*l));
43 if (!l)
44 return NULL;
40 l->cur_len = 0; 45 l->cur_len = 0;
41 l->max_len = 0; 46 l->max_len = 0;
42 l->el_size=element_size; 47 l->el_size=element_size;
43 l->els = NULL; 48 l->els = NULL;
44 return l; 49 return l;
46 51
47void psiconv_list_free(psiconv_list l) 52void psiconv_list_free(psiconv_list l)
48{ 53{
49 if (l->max_len) 54 if (l->max_len)
50 free(l->els); 55 free(l->els);
51 l->max_len = 0; 56 free(l);
52 l->cur_len = 0;
53 l->els = NULL; 57 l = NULL;
54} 58}
55 59
56void psiconv_list_free_el(psiconv_list l, void free_el(void *el)) 60void psiconv_list_free_el(psiconv_list l, void free_el(void *el))
57{ 61{
58 psiconv_list_foreach_el(l,free_el); 62 psiconv_list_foreach_el(l,free_el);
59 psiconv_list_free(l); 63 psiconv_list_free(l);
60} 64}
61 65
62int psiconv_list_length(const psiconv_list l) 66psiconv_u32 psiconv_list_length(const psiconv_list l)
63{ 67{
64 return l->cur_len; 68 return l->cur_len;
65} 69}
66 70
67int psiconv_list_is_empty(const psiconv_list l) 71int psiconv_list_is_empty(const psiconv_list l)
68{ 72{
69 return l->cur_len == 0; 73 return l->cur_len == 0;
70} 74}
71 75
76void psiconv_list_empty(psiconv_list l)
77{
78 l->cur_len = 0;
79}
80
72void *psiconv_list_get(const psiconv_list l, unsigned int indx) 81void *psiconv_list_get(const psiconv_list l, psiconv_u32 indx)
73{ 82{
74 if (indx >= l->cur_len) 83 if (indx >= l->cur_len)
75 return NULL; 84 return NULL;
76 else 85 else
77 return ((char *) (l->els)) + indx * l->el_size; 86 return ((char *) (l->els)) + indx * l->el_size;
78} 87}
79 88
80void psiconv_list_add(psiconv_list l, void *el) 89int psiconv_list_add(psiconv_list l, const void *el)
81{ 90{
91 int res;
82 psiconv_list_resize(l,l->cur_len + 1); 92 if ((res = psiconv_list_resize(l,l->cur_len + 1)))
93 return res;
83 memcpy(((char *) (l->els)) + l->cur_len * l->el_size, el, l->el_size); 94 memcpy(((char *) (l->els)) + l->cur_len * l->el_size, el, l->el_size);
84 l->cur_len ++; 95 l->cur_len ++;
96 return 0;
97}
98
99int psiconv_list_pop(psiconv_list l, void *el)
100{
101 if (! l->cur_len)
102 return -PSICONV_E_OTHER;
103 l->cur_len --;
104 memcpy(el,((char *)(l->els)) + l->cur_len * l->el_size,l->el_size);
105 return -PSICONV_E_OK;
106}
107
108int psiconv_list_replace(psiconv_list l, psiconv_u32 indx, const void *el)
109{
110 if (indx >= l->cur_len)
111 return -PSICONV_E_OTHER;
112 memcpy(((char *) (l->els)) + indx * l->el_size,el, l->el_size);
113 return -PSICONV_E_OK;
85} 114}
86 115
87void psiconv_list_foreach_el(psiconv_list l, void action(void *el)) 116void psiconv_list_foreach_el(psiconv_list l, void action(void *el))
88{ 117{
89 int i; 118 psiconv_u32 i;
90 for (i = 0; i < l->cur_len; i ++) 119 for (i = 0; i < l->cur_len; i ++)
91 action(psiconv_list_get(l,i)); 120 action(psiconv_list_get(l,i));
92} 121}
93 122
94psiconv_list psiconv_list_clone(const psiconv_list l) 123psiconv_list psiconv_list_clone(const psiconv_list l)
95{ 124{
96 psiconv_list l2; 125 psiconv_list l2;
97 int i; 126 psiconv_u32 i;
98 l2 = psiconv_list_new(l->el_size); 127 l2 = psiconv_list_new(l->el_size);
128 if (!l2)
129 return NULL;
99 for (i = 0; i < l->cur_len; i ++) 130 for (i = 0; i < l->cur_len; i ++)
100 psiconv_list_add(l2,psiconv_list_get(l,i)); 131 if (psiconv_list_add(l2,psiconv_list_get(l,i))) {
132 psiconv_list_free(l2);
133 return NULL;
134 }
101 return l2; 135 return l2;
102 136
103} 137}
104 138
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) 139size_t psiconv_list_fread(psiconv_list l,size_t size, FILE *f)
113{ 140{
114 size_t res; 141 size_t res;
115 psiconv_list_resize(l,l->cur_len + size); 142 if (psiconv_list_resize(l,l->cur_len + size))
143 return 0;
116 res = fread(((char *) (l->els)) + l->cur_len * l->el_size,l->el_size,size,f); 144 res = fread(((char *) (l->els)) + l->cur_len * l->el_size,l->el_size,size,f);
117 l->cur_len += res; 145 l->cur_len += res;
118 return res; 146 return res;
119} 147}
120 148
149int psiconv_list_fread_all(psiconv_list l, FILE *f)
150{
151 while (!feof(f)) {
152 if (!psiconv_list_fread(l,1024,f) && !feof(f))
153 return -PSICONV_E_NOMEM;
154 }
155 return -PSICONV_E_OK;
156}
157
158int psiconv_list_fwrite_all(const psiconv_list l, FILE *f)
159{
160 psiconv_u32 pos = 0;
161 psiconv_u32 written;
162 psiconv_u32 len = psiconv_list_length(l);
163 while (pos < len) {
164 if (!(written = fwrite(((char *)(l->els)) + pos * l->el_size,l->el_size,
165 len - pos,f)))
166 return -PSICONV_E_OTHER;
167 pos += written;
168 }
169 return -PSICONV_E_OK;
170}
171
121void psiconv_list_resize(psiconv_list l,unsigned int nr) 172int psiconv_list_resize(psiconv_list l,psiconv_u32 nr)
122{ 173{
174 void * temp;
123 if (nr > l->max_len) { 175 if (nr > l->max_len) {
124 l->max_len = 1.1 * nr; 176 l->max_len = 1.1 * nr;
125 l->max_len += 16 - l->max_len % 16; 177 l->max_len += 16 - l->max_len % 16;
126 l->els = realloc(l->els,l->max_len * l->el_size); 178 temp = realloc(l->els,l->max_len * l->el_size);
179 if (temp) {
180 l->els = temp;
181 return -PSICONV_E_OK;
182 } else
183 return -PSICONV_E_NOMEM;
127 } 184 }
185 return -PSICONV_E_OK;
128} 186}
129 187
188int psiconv_list_concat(psiconv_list l, const psiconv_list extra)
189{
190 int res;
191 if (l->el_size != extra->el_size)
192 return -PSICONV_E_OTHER;
193 if ((res = psiconv_list_resize(l,
194 l->cur_len + extra->cur_len)))
195 return res;
196 /* Unreadable but correct. */
197 memcpy(((char *) (l->els)) + l->cur_len * l->el_size,extra->els,
198 extra->cur_len * extra->el_size);
199 l->cur_len += extra->cur_len;
200 return 0;
201}
202
203

Legend:
Removed from v.2  
changed lines
  Added in v.141

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