--- libelwix/inc/elwix/aarray.h	2013/03/19 17:02:12	1.1.1.1.6.1
+++ libelwix/inc/elwix/aarray.h	2019/08/14 11:39:11	1.10.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aarray.h,v 1.1.1.1.6.1 2013/03/19 17:02:12 misho Exp $
+* $Id: aarray.h,v 1.10.2.1 2019/08/14 11:39:11 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+Copyright 2004 - 2019
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -55,23 +55,24 @@ typedef struct _tagArray {
 
 #define array_Size(_arr)		((_arr) ? (_arr)->arr_num : 0)
 #define array_Last(_arr)		(array_Size((_arr)) ? (_arr)->arr_last : -1)
-#define array_Zero(_arr)		(assert((_arr)), memset((_arr)->arr_data, 0, \
-						array_Size((_arr)) * sizeof(intptr_t)))
+#define array_Zero(_arr)		(assert((_arr)), (_arr)->arr_last = -1, \
+	       					memset((_arr)->arr_data, 0, array_Size((_arr)) * sizeof(intptr_t)))
 
+#define array_Ptr(_arr, _d)		((_arr) ? (_arr)->arr_data[_d] : NULL)
 #define array_Get2(_arr, _d)		(assert((_arr) && (_arr)->arr_num > _d), ((_arr)->arr_data + _d))
-#define array_Get(_arr, _d)		(assert((_arr) && (_arr)->arr_num > _d), (_arr)->arr_data[_d])
-#define array(_arr, _d, _type)		(assert((_arr) && (_arr)->arr_num > _d), \
-						((_type) (_arr)->arr_data[_d]))
-#define array_Set(_arr, _d, _ptr)	do { assert((_arr) && (_arr)->arr_num > _d); \
-						if ((_arr)->arr_last < _d) \
-							(_arr)->arr_last = _d; \
-						(_arr)->arr_data[_d] = (void*) (_ptr); \
+#define array_Get(_arr, _d)		(assert((_arr)), (_arr)->arr_data[_d])
+#define array(_arr, _d, _type)		(assert((_arr)), ((_type) (_arr)->arr_data[_d]))
+#define array_Set(_arr, _d, _ptr)	do { int __d = _d; assert((_arr) && (_arr)->arr_num > __d); \
+						if ((_arr)->arr_last < __d) \
+							(_arr)->arr_last = __d; \
+						(_arr)->arr_data[__d] = (void*) (_ptr); \
 					} while (0)
-#define array_Del(_arr, _d, _fri)	do { assert((_arr) && (_arr)->arr_num > _d); \
-						if (_fri && (_arr)->arr_data[_d]) \
-							e_free((_arr)->arr_data[_d]); \
-						(_arr)->arr_data[_d] = NULL; \
+#define array_Del(_arr, _d, _fri)	do { int __d = _d; assert((_arr) && (_arr)->arr_num > __d); \
+						if (_fri && (_arr)->arr_data[__d]) \
+							e_free((_arr)->arr_data[__d]); \
+						(_arr)->arr_data[__d] = NULL; \
 					} while (0)
+#define array_Var(_arr, _d)		(assert((_arr) && (_arr)->arr_num > _d), (ait_val_t*) ((_arr)->arr_data + _d))
 
 /*
  * array_Init() - Create and initialize dynamic array
@@ -79,22 +80,45 @@ typedef struct _tagArray {
  * @numItems = Number of Items
  * return: NULL error, != NULL allocated memory for array
  */
-inline array_t *array_Init(int numItems);
+array_t *array_Init(int numItems);
 /*
+ * array_Init2() - Initialize dynamic array
+ *
+ * @arr = Allocated array variable
+ * @numItems = Number of Items
+ * return: NULL error, != NULL allocated memory for array
+ */
+array_t *array_Init2(array_t * __restrict arr, int numItems);
+/*
  * array_Destroy() - Free and destroy dynamic array
  *
  * @parr = Array
  * return: none
  */
-inline void array_Destroy(array_t ** __restrict parr);
+void array_Destroy(array_t ** __restrict parr);
 /*
+ * array_Destroy2() - Free data in dynamic array
+ *
+ * @parr = Array
+ * return: none
+ */
+void array_Destroy2(array_t * __restrict arr);
+/*
  * array_Free() - Free all data in dynamic array items
  *	(WARNING! If assign static array dont use this!!!)
  *
  * @arr = Array
  * return: none
  */
-inline void array_Free(array_t * __restrict arr);
+void array_Free(array_t * __restrict arr);
+/*
+ * array_Reset() - Reset array to initial state
+ *
+ * @parr = Array
+ * @purge = Purge all data, if <>0 then will be free entire data memory
+ * return: none
+ */
+void array_Reset(array_t * __restrict arr, int purge);
 
 /*
  * array_From() - Create and fill array from array with pointers
@@ -106,7 +130,7 @@ inline void array_Free(array_t * __restrict arr);
 array_t *array_From(const char *** __restrict pargv, int argc);
 /*
  * array_Args() Parse and make array from arguments ... (input string will be modified!!! 
- *	and output array must be free with io_arrayDestroy() after use!)
+ *	and output array must be free with array_Destroy() after use!)
  *
  * @psArgs = Input arguments line, after execute string is modified!!!
  * @nargs = Maximum requested count of arguments from input string psArgs, if 0 all psArgs
@@ -130,7 +154,7 @@ char **array_To(array_t * __restrict arr);
  * @arr = Array
  * return: -1 empty or >-1 position of last used element
  */
-inline int array_Len(array_t * __restrict arr);
+int array_Len(array_t * __restrict arr);
 
 /*
  * array_Grow() - Grow/Shrink dynamic array, Use with care when it shrink!!!
@@ -160,7 +184,7 @@ int array_Concat(array_t * __restrict dest, array_t * 
 /*
  * array_Copy() Copy source array to destination array
  *
- * @dest = Destination array, after use free with io_arrayDestroy()
+ * @dest = Destination array, after use free with array_Destroy()
  * @src = Source array
  * return: -1 error; >0 count of destination array
  */
@@ -174,7 +198,7 @@ int array_Copy(array_t ** __restrict dest, array_t * _
  * @data = Element, if set NULL GET element at position or !=NULL PUT element at position
  * return: -1 error or !=-1 return element at position
  */
-inline void *array_Elem(array_t * __restrict arr, int n, void *data);
+void *array_Elem(array_t * __restrict arr, int n, void *data);
 /*
  * array_Push() - Push element into dynamic array like stack manner, place at first empty position
  *
@@ -183,7 +207,7 @@ inline void *array_Elem(array_t * __restrict arr, int 
  * @nogrow = Don't grow array if not enough space
  * return: -1 not found empty position, array is full!, >-1 return position of stored element into array
  */
-inline int array_Push(array_t * __restrict arr, void *data, int nogrow);
+int array_Push(array_t * __restrict arr, void *data, int nogrow);
 /*
  * array_Pop() - Pop element from dynamic array like stack manner, last used position
  *
@@ -192,7 +216,7 @@ inline int array_Push(array_t * __restrict arr, void *
  * @nodel = Don't delete after Pop element
  * return: -1 not found used position, array is empty!, >-1 return element position
  */
-inline int array_Pop(array_t * __restrict arr, void ** __restrict data, int nodel);
+int array_Pop(array_t * __restrict arr, void ** __restrict data, int nodel);
 
 
 #endif