/[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 76 Revision 79
21#include "config.h" 21#include "config.h"
22#include "compat.h" 22#include "compat.h"
23#include <stddef.h> 23#include <stddef.h>
24#include <stdlib.h> 24#include <stdlib.h>
25#include <stdio.h> 25#include <stdio.h>
26#include "general.h"
26#include "list.h" 27#include "list.h"
27#include "error.h" 28#include "error.h"
28 29
29static int psiconv_list_resize(psiconv_list l,unsigned int nr); 30static int psiconv_list_resize(psiconv_list l,psiconv_u32 nr);
30 31
31struct psiconv_list_s { 32struct psiconv_list_s {
32 int cur_len; 33 psiconv_u32 cur_len;
33 int max_len; 34 psiconv_u32 max_len;
34 int el_size; 35 size_t el_size;
35 void *els; 36 void *els;
36}; 37};
37 38
38psiconv_list psiconv_list_new(int element_size) 39psiconv_list psiconv_list_new(size_t element_size)
39{ 40{
40 psiconv_list l; 41 psiconv_list l;
41 l = malloc(sizeof(*l)); 42 l = malloc(sizeof(*l));
42 if (!l) 43 if (!l)
43 return NULL; 44 return NULL;
61{ 62{
62 psiconv_list_foreach_el(l,free_el); 63 psiconv_list_foreach_el(l,free_el);
63 psiconv_list_free(l); 64 psiconv_list_free(l);
64} 65}
65 66
66int psiconv_list_length(const psiconv_list l) 67psiconv_u32 psiconv_list_length(const psiconv_list l)
67{ 68{
68 return l->cur_len; 69 return l->cur_len;
69} 70}
70 71
71int psiconv_list_is_empty(const psiconv_list l) 72int psiconv_list_is_empty(const psiconv_list l)
72{ 73{
73 return l->cur_len == 0; 74 return l->cur_len == 0;
74} 75}
75 76
76void *psiconv_list_get(const psiconv_list l, unsigned int indx) 77void *psiconv_list_get(const psiconv_list l, psiconv_u32 indx)
77{ 78{
78 if (indx >= l->cur_len) 79 if (indx >= l->cur_len)
79 return NULL; 80 return NULL;
80 else 81 else
81 return ((char *) (l->els)) + indx * l->el_size; 82 return ((char *) (l->els)) + indx * l->el_size;
91 return 0; 92 return 0;
92} 93}
93 94
94void psiconv_list_foreach_el(psiconv_list l, void action(void *el)) 95void psiconv_list_foreach_el(psiconv_list l, void action(void *el))
95{ 96{
96 int i; 97 psiconv_u32 i;
97 for (i = 0; i < l->cur_len; i ++) 98 for (i = 0; i < l->cur_len; i ++)
98 action(psiconv_list_get(l,i)); 99 action(psiconv_list_get(l,i));
99} 100}
100 101
101psiconv_list psiconv_list_clone(const psiconv_list l) 102psiconv_list psiconv_list_clone(const psiconv_list l)
102{ 103{
103 psiconv_list l2; 104 psiconv_list l2;
104 int i; 105 psiconv_u32 i;
105 l2 = psiconv_list_new(l->el_size); 106 l2 = psiconv_list_new(l->el_size);
106 if (!l2) 107 if (!l2)
107 return NULL; 108 return NULL;
108 for (i = 0; i < l->cur_len; i ++) 109 for (i = 0; i < l->cur_len; i ++)
109 if (psiconv_list_add(l2,psiconv_list_get(l,i))) { 110 if (psiconv_list_add(l2,psiconv_list_get(l,i))) {
133 return -PSICONV_E_OK; 134 return -PSICONV_E_OK;
134} 135}
135 136
136int psiconv_list_fwrite_all(const psiconv_list l, FILE *f) 137int psiconv_list_fwrite_all(const psiconv_list l, FILE *f)
137{ 138{
138 int pos = 0; 139 psiconv_u32 pos = 0;
139 int written; 140 psiconv_u32 written;
140 int len = psiconv_list_length(l); 141 psiconv_u32 len = psiconv_list_length(l);
141 while (pos < len) { 142 while (pos < len) {
142 if (!(written = fwrite(((char *)(l->els)) + pos * l->el_size,l->el_size, 143 if (!(written = fwrite(((char *)(l->els)) + pos * l->el_size,l->el_size,
143 len - pos,f))) 144 len - pos,f)))
144 return -PSICONV_E_OTHER; 145 return -PSICONV_E_OTHER;
145 pos += written; 146 pos += written;
146 } 147 }
147 return -PSICONV_E_OK; 148 return -PSICONV_E_OK;
148} 149}
149 150
150int psiconv_list_resize(psiconv_list l,unsigned int nr) 151int psiconv_list_resize(psiconv_list l,psiconv_u32 nr)
151{ 152{
152 void * temp; 153 void * temp;
153 if (nr > l->max_len) { 154 if (nr > l->max_len) {
154 l->max_len = 1.1 * nr; 155 l->max_len = 1.1 * nr;
155 l->max_len += 16 - l->max_len % 16; 156 l->max_len += 16 - l->max_len % 16;

Legend:
Removed from v.76  
changed lines
  Added in v.79

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