/[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 80
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;
… …
57{ 62{
58 psiconv_list_foreach_el(l,free_el); 63 psiconv_list_foreach_el(l,free_el);
59 psiconv_list_free(l); 64 psiconv_list_free(l);
60} 65}
61 66
62int psiconv_list_length(const psiconv_list l) 67psiconv_u32 psiconv_list_length(const psiconv_list l)
63{ 68{
64 return l->cur_len; 69 return l->cur_len;
65} 70}
66 71
67int psiconv_list_is_empty(const psiconv_list l) 72int psiconv_list_is_empty(const psiconv_list l)
68{ 73{
69 return l->cur_len == 0; 74 return l->cur_len == 0;
70} 75}
71 76
77void psiconv_list_empty(psiconv_list l)
78{
79 l->cur_len = 0;
80}
81
72void *psiconv_list_get(const psiconv_list l, unsigned int indx) 82void *psiconv_list_get(const psiconv_list l, psiconv_u32 indx)
73{ 83{
74 if (indx >= l->cur_len) 84 if (indx >= l->cur_len)
75 return NULL; 85 return NULL;
76 else 86 else
77 return ((char *) (l->els)) + indx * l->el_size; 87 return ((char *) (l->els)) + indx * l->el_size;
78} 88}
79 89
80void psiconv_list_add(psiconv_list l, void *el) 90int psiconv_list_add(psiconv_list l, const void *el)
81{ 91{
92 int res;
82 psiconv_list_resize(l,l->cur_len + 1); 93 if ((res = psiconv_list_resize(l,l->cur_len + 1)))
94 return res;
83 memcpy(((char *) (l->els)) + l->cur_len * l->el_size, el, l->el_size); 95 memcpy(((char *) (l->els)) + l->cur_len * l->el_size, el, l->el_size);
84 l->cur_len ++; 96 l->cur_len ++;
97 return 0;
98}
99
100int psiconv_list_replace(psiconv_list l, psiconv_u32 indx, const void *el)
101{
102 if (indx >= l->cur_len)
103 return -PSICONV_E_OTHER;
104 memcpy(((char *) (l->els)) + indx * l->el_size,el, l->el_size);
105 return -PSICONV_E_OK;
85} 106}
86 107
87void psiconv_list_foreach_el(psiconv_list l, void action(void *el)) 108void psiconv_list_foreach_el(psiconv_list l, void action(void *el))
88{ 109{
89 int i; 110 psiconv_u32 i;
90 for (i = 0; i < l->cur_len; i ++) 111 for (i = 0; i < l->cur_len; i ++)
91 action(psiconv_list_get(l,i)); 112 action(psiconv_list_get(l,i));
92} 113}
93 114
94psiconv_list psiconv_list_clone(const psiconv_list l) 115psiconv_list psiconv_list_clone(const psiconv_list l)
95{ 116{
96 psiconv_list l2; 117 psiconv_list l2;
97 int i; 118 psiconv_u32 i;
98 l2 = psiconv_list_new(l->el_size); 119 l2 = psiconv_list_new(l->el_size);
120 if (!l2)
121 return NULL;
99 for (i = 0; i < l->cur_len; i ++) 122 for (i = 0; i < l->cur_len; i ++)
100 psiconv_list_add(l2,psiconv_list_get(l,i)); 123 if (psiconv_list_add(l2,psiconv_list_get(l,i))) {
124 psiconv_list_free(l2);
125 return NULL;
126 }
101 return l2; 127 return l2;
102 128
103}
104
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} 129}
111 130
112size_t psiconv_list_fread(psiconv_list l,size_t size, FILE *f) 131size_t psiconv_list_fread(psiconv_list l,size_t size, FILE *f)
113{ 132{
114 size_t res; 133 size_t res;
115 psiconv_list_resize(l,l->cur_len + size); 134 if (psiconv_list_resize(l,l->cur_len + size))
135 return 0;
116 res = fread(((char *) (l->els)) + l->cur_len * l->el_size,l->el_size,size,f); 136 res = fread(((char *) (l->els)) + l->cur_len * l->el_size,l->el_size,size,f);
117 l->cur_len += res; 137 l->cur_len += res;
118 return res; 138 return res;
119} 139}
120 140
121void psiconv_list_resize(psiconv_list l,unsigned int nr) 141int psiconv_list_fread_all(psiconv_list l, FILE *f)
122{ 142{
143 while (!feof(f)) {
144 if (!psiconv_list_fread(l,1024,f) && !feof(f))
145 return -PSICONV_E_NOMEM;
146 }
147 return -PSICONV_E_OK;
148}
149
150int psiconv_list_fwrite_all(const psiconv_list l, FILE *f)
151{
152 psiconv_u32 pos = 0;
153 psiconv_u32 written;
154 psiconv_u32 len = psiconv_list_length(l);
155 while (pos < len) {
156 if (!(written = fwrite(((char *)(l->els)) + pos * l->el_size,l->el_size,
157 len - pos,f)))
158 return -PSICONV_E_OTHER;
159 pos += written;
160 }
161 return -PSICONV_E_OK;
162}
163
164int psiconv_list_resize(psiconv_list l,psiconv_u32 nr)
165{
166 void * temp;
123 if (nr > l->max_len) { 167 if (nr > l->max_len) {
124 l->max_len = 1.1 * nr; 168 l->max_len = 1.1 * nr;
125 l->max_len += 16 - l->max_len % 16; 169 l->max_len += 16 - l->max_len % 16;
126 l->els = realloc(l->els,l->max_len * l->el_size); 170 temp = realloc(l->els,l->max_len * l->el_size);
171 if (temp) {
172 l->els = temp;
173 return -PSICONV_E_OK;
174 } else
175 return -PSICONV_E_NOMEM;
127 } 176 }
177 return -PSICONV_E_OK;
128} 178}
129 179
180int psiconv_list_concat(psiconv_list l, const psiconv_list extra)
181{
182 int res;
183 if (l->el_size != extra->el_size)
184 return -PSICONV_E_OTHER;
185 if ((res = psiconv_list_resize(l,
186 l->cur_len + extra->cur_len)))
187 return res;
188 /* Unreadable but correct. */
189 memcpy(((char *) (l->els)) + l->cur_len * l->el_size,extra->els,
190 extra->cur_len * extra->el_size);
191 l->cur_len += extra->cur_len;
192 return 0;
193}
194
195
Legend:
Removed from v.2  
changed lines
  Added in v.80
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26