/[public]/psiconv/trunk/lib/psiconv/list.c

Diff of /psiconv/trunk/lib/psiconv/list.c

Parent Directory | Revision Log | View Patch Patch

Revision 71		Revision 76
…		…
81	return ((char ) (l->els)) + indx l->el_size;	81	return ((char ) (l->els)) + indx l->el_size;
82	}	82	}
83		83
84	int psiconv_list_add(psiconv_list l, const void *el)	84	int psiconv_list_add(psiconv_list l, const void *el)
85	{	85	{
		86	int res;
86	if (psiconv_list_resize(l,l->cur_len + 1))	87	if ((res = psiconv_list_resize(l,l->cur_len + 1)))
87	return -PSICONV_E_NOMEM;	88	return res;
88	memcpy(((char ) (l->els)) + l->cur_len l->el_size, el, l->el_size);	89	memcpy(((char ) (l->els)) + l->cur_len l->el_size, el, l->el_size);
89	l->cur_len ++;	90	l->cur_len ++;
90	return 0;	91	return 0;
91	}	92	}
92		93
…		…
111	}	112	}
112	return l2;	113	return l2;
113		114
114	}	115	}
115		116
116
117	size_t psiconv_list_fread(psiconv_list l,size_t size, FILE *f)	117	size_t psiconv_list_fread(psiconv_list l,size_t size, FILE *f)
118	{	118	{
119	size_t res;	119	size_t res;
120	if (psiconv_list_resize(l,l->cur_len + size))	120	if (psiconv_list_resize(l,l->cur_len + size))
121	return 0;	121	return 0;
122	res = fread(((char ) (l->els)) + l->cur_len l->el_size,l->el_size,size,f);	122	res = fread(((char ) (l->els)) + l->cur_len l->el_size,l->el_size,size,f);
123	l->cur_len += res;	123	l->cur_len += res;
124	return res;	124	return res;
		125	}
		126
		127	int psiconv_list_fread_all(psiconv_list l, FILE *f)
		128	{
		129	while (!feof(f)) {
		130	if (!psiconv_list_fread(l,1024,f) && !feof(f))
		131	return -PSICONV_E_NOMEM;
		132	}
		133	return -PSICONV_E_OK;
		134	}
		135
		136	int psiconv_list_fwrite_all(const psiconv_list l, FILE *f)
		137	{
		138	int pos = 0;
		139	int written;
		140	int len = psiconv_list_length(l);
		141	while (pos < len) {
		142	if (!(written = fwrite(((char )(l->els)) + pos l->el_size,l->el_size,
		143	len - pos,f)))
		144	return -PSICONV_E_OTHER;
		145	pos += written;
		146	}
		147	return -PSICONV_E_OK;
125	}	148	}
126		149
127	int psiconv_list_resize(psiconv_list l,unsigned int nr)	150	int psiconv_list_resize(psiconv_list l,unsigned int nr)
128	{	151	{
129	void * temp;	152	void * temp;
…		…
131	l->max_len = 1.1 * nr;	154	l->max_len = 1.1 * nr;
132	l->max_len += 16 - l->max_len % 16;	155	l->max_len += 16 - l->max_len % 16;
133	temp = realloc(l->els,l->max_len * l->el_size);	156	temp = realloc(l->els,l->max_len * l->el_size);
134	if (temp) {	157	if (temp) {
135	l->els = temp;	158	l->els = temp;
136	return 0;	159	return -PSICONV_E_OK;
137	} else	160	} else
138	return -PSICONV_E_NOMEM;	161	return -PSICONV_E_NOMEM;
139	}	162	}
		163	return -PSICONV_E_OK;
		164	}
		165
		166	int psiconv_list_concat(psiconv_list l, const psiconv_list extra)
		167	{
		168	int res;
		169	if (l->el_size != extra->el_size)
		170	return -PSICONV_E_OTHER;
		171	if ((res = psiconv_list_resize(l,
		172	l->cur_len + extra->cur_len)))
		173	return res;
		174	/* Unreadable but correct. */
		175	memcpy(((char ) (l->els)) + l->cur_len l->el_size,extra->els,
		176	extra->cur_len * extra->el_size);
		177	l->cur_len += extra->cur_len;
140	return 0;	178	return 0;
141	}	179	}
142

 Legend:



Removed from v.71
 


changed lines


 
Added in v.76
 Legend:



Removed from v.71
 


changed lines


 
Added in v.76
-Removed from v.71
+Added in v.76

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