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