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