--- psiconv/trunk/lib/psiconv/list.c 2000/12/25 00:26:53 76 +++ psiconv/trunk/lib/psiconv/list.c 2000/12/25 22:25:33 79 @@ -23,19 +23,20 @@ #include #include #include +#include "general.h" #include "list.h" #include "error.h" -static int psiconv_list_resize(psiconv_list l,unsigned int nr); +static int psiconv_list_resize(psiconv_list l,psiconv_u32 nr); struct psiconv_list_s { - int cur_len; - int max_len; - int el_size; + psiconv_u32 cur_len; + psiconv_u32 max_len; + size_t el_size; void *els; }; -psiconv_list psiconv_list_new(int element_size) +psiconv_list psiconv_list_new(size_t element_size) { psiconv_list l; l = malloc(sizeof(*l)); @@ -63,7 +64,7 @@ psiconv_list_free(l); } -int psiconv_list_length(const psiconv_list l) +psiconv_u32 psiconv_list_length(const psiconv_list l) { return l->cur_len; } @@ -73,7 +74,7 @@ return l->cur_len == 0; } -void *psiconv_list_get(const psiconv_list l, unsigned int indx) +void *psiconv_list_get(const psiconv_list l, psiconv_u32 indx) { if (indx >= l->cur_len) return NULL; @@ -93,7 +94,7 @@ void psiconv_list_foreach_el(psiconv_list l, void action(void *el)) { - int i; + psiconv_u32 i; for (i = 0; i < l->cur_len; i ++) action(psiconv_list_get(l,i)); } @@ -101,7 +102,7 @@ psiconv_list psiconv_list_clone(const psiconv_list l) { psiconv_list l2; - int i; + psiconv_u32 i; l2 = psiconv_list_new(l->el_size); if (!l2) return NULL; @@ -135,9 +136,9 @@ int psiconv_list_fwrite_all(const psiconv_list l, FILE *f) { - int pos = 0; - int written; - int len = psiconv_list_length(l); + psiconv_u32 pos = 0; + psiconv_u32 written; + psiconv_u32 len = psiconv_list_length(l); while (pos < len) { if (!(written = fwrite(((char *)(l->els)) + pos * l->el_size,l->el_size, len - pos,f))) @@ -147,7 +148,7 @@ return -PSICONV_E_OK; } -int psiconv_list_resize(psiconv_list l,unsigned int nr) +int psiconv_list_resize(psiconv_list l,psiconv_u32 nr) { void * temp; if (nr > l->max_len) {