libelwix/src/array.c - diff

Return to array.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / libelwix / src

Diff for /libelwix/src/array.c between versions 1.9 and 1.10

version 1.9, 2019/01/23 18:22:41	version 1.10, 2024/10/28 09:58:51
Line 12 terms:	Line 12 terms:
All of the documentation and software included in the ELWIX and AITNET	All of the documentation and software included in the ELWIX and AITNET
Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>	Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>

Copyright 2004 - 2019	Copyright 2004 - 2024
by Michael Pounov <misho@elwix.org>. All rights reserved.	by Michael Pounov <misho@elwix.org>. All rights reserved.

Redistribution and use in source and binary forms, with or without	Redistribution and use in source and binary forms, with or without
Line 234 array_Reset(array_t * __restrict arr, int purge)	Line 234 array_Reset(array_t * __restrict arr, int purge)
arr->arr_data = e_calloc(array_Size(arr), sizeof(intptr_t));	arr->arr_data = e_calloc(array_Size(arr), sizeof(intptr_t));
}	}

array_Zero(arr);	if (arr->arr_data)
	array_Zero(arr);
}	}

/*	/*
Line 375 array_Concat(array_t * __restrict dest, array_t * __re	Line 376 array_Concat(array_t * __restrict dest, array_t * __re
n = array_Size(dest);	n = array_Size(dest);
if (array_Grow(dest, n + array_Size(src), 0))	if (array_Grow(dest, n + array_Size(src), 0))
return -1;	return -1;
	if (!dest->arr_data)
	return -1;
memcpy(dest->arr_data + n, src->arr_data, array_Size(src) * sizeof(intptr_t));	memcpy(dest->arr_data + n, src->arr_data, array_Size(src) * sizeof(intptr_t));

dest->arr_last = array_Len(dest);	dest->arr_last = array_Len(dest);
Line 422 array_Elem(array_t * __restrict arr, int n, void *data	Line 425 array_Elem(array_t * __restrict arr, int n, void *data

if (n >= array_Size(arr) && array_Grow(arr, n + 1, 0))	if (n >= array_Size(arr) && array_Grow(arr, n + 1, 0))
return (void*) -1;	return (void*) -1;
	if (!arr->arr_data)
	return (void*) -1;

dat = array_Get(arr, n);	dat = array_Get(arr, n);
if (data)	if (data)
Line 450 array_Push(array_t * __restrict arr, void *data, int n	Line 455 array_Push(array_t * __restrict arr, void *data, int n
if (nogrow && ret >= array_Size(arr))	if (nogrow && ret >= array_Size(arr))
return -1;	return -1;
if (!nogrow && ret >= array_Size(arr) && array_Grow(arr, ret + 1, 0))	if (!nogrow && ret >= array_Size(arr) && array_Grow(arr, ret + 1, 0))
	return -1;
	if (!arr->arr_data)
return -1;	return -1;

ret = ++arr->arr_last;	ret = ++arr->arr_last;

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.9
changed lines
	Added in v.1.10