--- libaitio/inc/aitio.h 2012/03/15 01:52:22 1.15 +++ libaitio/inc/aitio.h 2012/05/19 00:00:12 1.18 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitio.h,v 1.15 2012/03/15 01:52:22 misho Exp $ +* $Id: aitio.h,v 1.18 2012/05/19 00:00:12 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -74,6 +74,7 @@ typedef struct _tagSplitArray { } sarr_t; typedef struct _tagArray { + int arr_last; int arr_num; void **arr_data; } array_t; @@ -81,7 +82,7 @@ typedef struct _tagArray { /* AIT RPC variables and managment */ typedef enum { - empty, ptr, /* empty -> variable is not set; ptr -> void* */ + empty, ptr, data, /* empty -> variable is not set; ptr -> void*; data -> data after struct */ buffer, string, blob, /* buffer -> uint8_t*; string -> int8_t*; blob -> uint32_t blobID(+socket); */ f32, f64, /* float -> f32; double -> f64 */ u8, u16, u32, u64, /* unsigned integers ... */ @@ -90,7 +91,8 @@ typedef enum { typedef struct { uint8_t val_type; - uint8_t val_pad[3]; + uint8_t val_pad; + uint16_t val_key; uint32_t val_len; union { uint64_t net; @@ -110,42 +112,68 @@ typedef struct { int32_t i32; int64_t i64; } val; + uint8_t val_data[0]; } __packed ait_val_t; #define AIT_TYPE(_vl) ((ait_type_t) (_vl)->val_type) #define AIT_LEN(_vl) (_vl)->val_len +#define AIT_KEY(_vl) (_vl)->val_key #define AIT_RAW(_vl) (_vl)->val.net -#define AIT_VOID(_vl) (_vl)->val.ptr -#define AIT_BLOB_CHUNKS(_vl, _n) (assert((_vl)), AIT_LEN((_vl)) / _n + (AIT_LEN((_vl)) % _n) ? 1 : 0) -#define AIT_ISEMPTY(_vl) (assert((_vl)), AIT_TYPE((_vl)) == empty) +#define AIT_ADDR(_vl) (_vl)->val.ptr +#define AIT_BLOB_CHUNKS(_vl, _n) (AIT_LEN((_vl)) / _n + (AIT_LEN((_vl)) % _n) ? 1 : 0) +#define AIT_ISEMPTY(_vl) (AIT_TYPE((_vl)) == empty) -#define AIT_GET_LIKE(_vl, _type) (assert((_vl)), (_type) (_vl)->val.ptr) +#define AIT_GET_LIKE(_vl, _type) ((_type) AIT_ADDR((_vl))) -#define AIT_GET_PTR(_vl) (assert((_vl)), assert(AIT_TYPE((_vl)) == ptr), (_vl)->val.ptr) -#define AIT_GET_BUF(_vl) (assert((_vl)), assert(AIT_TYPE((_vl)) == buffer), (_vl)->val.buffer) -#define AIT_GET_STR(_vl) (assert((_vl)), assert(AIT_TYPE((_vl)) == string), (_vl)->val.string) -#define AIT_GET_BLOB(_vl) (assert((_vl)), assert(AIT_TYPE((_vl)) == blob), (_vl)->val.blob) -#define AIT_GET_U8(_vl) (assert((_vl)), assert(AIT_TYPE((_vl)) == u8), (_vl)->val.u8) -#define AIT_GET_U16(_vl) (assert((_vl)), assert(AIT_TYPE((_vl)) == u16), (_vl)->val.u16) -#define AIT_GET_U32(_vl) (assert((_vl)), assert(AIT_TYPE((_vl)) == u32), (_vl)->val.u32) -#define AIT_GET_U64(_vl) (assert((_vl)), assert(AIT_TYPE((_vl)) == u64), (_vl)->val.u64) -#define AIT_GET_I8(_vl) (assert((_vl)), assert(AIT_TYPE((_vl)) == i8), (_vl)->val.i8) -#define AIT_GET_I16(_vl) (assert((_vl)), assert(AIT_TYPE((_vl)) == i16), (_vl)->val.i16) -#define AIT_GET_I32(_vl) (assert((_vl)), assert(AIT_TYPE((_vl)) == i32), (_vl)->val.i32) -#define AIT_GET_I64(_vl) (assert((_vl)), assert(AIT_TYPE((_vl)) == i64), (_vl)->val.i64) -#define AIT_GET_F32(_vl) (assert((_vl)), assert(AIT_TYPE((_vl)) == f32), (_vl)->val.f32) -#define AIT_GET_F64(_vl) (assert((_vl)), assert(AIT_TYPE((_vl)) == f64), (_vl)->val.f64) +#define AIT_GET_PTR(_vl) (assert(AIT_TYPE((_vl)) == ptr), (_vl)->val.ptr) +#define AIT_GET_DATA(_vl) (assert(AIT_TYPE((_vl)) == data), (_vl)->val_data) +#define AIT_GET_BUF(_vl) (assert(AIT_TYPE((_vl)) == buffer), (_vl)->val.buffer) +#define AIT_GET_STR(_vl) (assert(AIT_TYPE((_vl)) == string), (char*) (_vl)->val.string) +#define AIT_GET_BLOB(_vl) (assert(AIT_TYPE((_vl)) == blob), (_vl)->val.blob) +#define AIT_GET_U8(_vl) (assert(AIT_TYPE((_vl)) == u8), (_vl)->val.u8) +#define AIT_GET_U16(_vl) (assert(AIT_TYPE((_vl)) == u16), (_vl)->val.u16) +#define AIT_GET_U32(_vl) (assert(AIT_TYPE((_vl)) == u32), (_vl)->val.u32) +#define AIT_GET_U64(_vl) (assert(AIT_TYPE((_vl)) == u64), (_vl)->val.u64) +#define AIT_GET_I8(_vl) (assert(AIT_TYPE((_vl)) == i8), (_vl)->val.i8) +#define AIT_GET_I16(_vl) (assert(AIT_TYPE((_vl)) == i16), (_vl)->val.i16) +#define AIT_GET_I32(_vl) (assert(AIT_TYPE((_vl)) == i32), (_vl)->val.i32) +#define AIT_GET_I64(_vl) (assert(AIT_TYPE((_vl)) == i64), (_vl)->val.i64) +#define AIT_GET_F32(_vl) (assert(AIT_TYPE((_vl)) == f32), (_vl)->val.f32) +#define AIT_GET_F64(_vl) (assert(AIT_TYPE((_vl)) == f64), (_vl)->val.f64) +#define AIT_SET_DATA(_vl, _p, _len) do { ait_val_t *__val = (_vl); \ + __val = realloc(__val, sizeof(ait_val_t) + _len); \ + if (__val) { \ + __val->val_type = data; AIT_LEN(__val) = _len; \ + if ((_p)) \ + memcpy(__val->val_data, (_p), _len); \ + } \ + (_vl) = __val; \ + } while (0); #define AIT_SET_PTR(_vl, _p, _len) do { ait_val_t *__val = (_vl); assert(__val); \ __val->val_type = ptr; AIT_LEN(__val) = _len; \ __val->val.ptr = _p; } while (0) +#define AIT_RE_BUF(_vl, _len) do { ait_val_t *__val = (_vl); assert(__val); \ + void *__ptr = realloc(AIT_GET_BUF(__val), _len); \ + if (__ptr) { \ + __val->val.buffer = __ptr; AIT_LEN(__val) = _len; \ + } } while (0) +#define AIT_SET_BUF2(_vl, _c, _len) do { ait_val_t *__val = (_vl); assert(__val); \ + __val->val.buffer = malloc(_len); \ + if (__val->val.buffer) { \ + __val->val_type = buffer; AIT_LEN(__val) = _len; \ + memset(__val->val.buffer, _c, _len); \ + } } while (0) #define AIT_SET_BUF(_vl, _v, _len) do { ait_val_t *__val = (_vl); assert(__val); \ __val->val.buffer = malloc(_len); \ if (__val->val.buffer) { \ __val->val_type = buffer; AIT_LEN(__val) = _len; \ - memcpy(__val->val.buffer, (_v), _len); \ + if ((_v)) \ + memcpy(__val->val.buffer, (_v), _len); \ + else \ + memset(__val->val.buffer, 0, _len); \ } } while (0) -#define AIT_SET_STR(_vl, _v) do { ait_val_t *__val = (_vl); assert(__val); \ +#define AIT_SET_STR(_vl, _v) do { ait_val_t *__val = (_vl); assert(__val && (_v)); \ __val->val.string = (int8_t*) strdup((_v)); \ if (__val->val.string) { \ __val->val_type = string; \ @@ -153,11 +181,13 @@ typedef struct { } } while (0) #define AIT_SET_STRCAT(_vl, _v) do { ait_val_t *__val = (_vl); assert(__val); \ assert(AIT_TYPE(__val) == string); \ - void *__p = realloc(AIT_LEN(__val) + strlen((_v))); \ + void *__p = realloc(__val->val.string, \ + AIT_LEN(__val) + strlen((_v))); \ if (__p) { \ __val->val.string = __p; \ AIT_LEN(__val) += strlen((_v)); \ - strlcat(__val->val.string, (_v), AIT_LEN(__val)); \ + strlcat((char*) __val->val.string, (_v), \ + AIT_LEN(__val)); \ } } while (0) #define AIT_SET_BLOB(_vl, _n, _len) do { ait_val_t *__val = (_vl); assert(__val); \ __val->val_type = blob; AIT_LEN(__val) = _len; \ @@ -198,9 +228,27 @@ typedef struct { __val->val_type = f64; __val->val.f64 = _n; \ AIT_LEN(__val) = sizeof(double); } while (0) +#define AIT_COPY_VAL(_vl, _v) do { memcpy((_vl), (_v), sizeof(ait_val_t)); \ + switch (AIT_TYPE((_vl))) { \ + case buffer: \ + AIT_SET_BUF((_vl), AIT_GET_BUF((_v)), AIT_LEN((_v))); \ + break; \ + case string: \ + AIT_SET_STR((_vl), AIT_GET_STR((_v))); \ + break; \ + default: \ + break; \ + } \ + } while (0) +#define AIT_COPY_VAL2(_vl, _v) do { AIT_COPY_VAL((_vl), (_v)); \ + if (AIT_TYPE((_vl)) == data) \ + AIT_SET_DATA((_vl), AIT_GET_DATA((_v)), AIT_LEN((_v))); \ + } while (0) + +#define AIT_INIT_VAL(_vl) (memset((_vl), 0, sizeof(ait_val_t))) /* if attribute zeroCopy is set not execute free() */ -#define AIT_FREE_VAL(_vl) do { ait_val_t *__val = (ait_val_t*) (_vl); assert(__val); \ - switch (__val->val_type) { \ +#define AIT_FREE_VAL(_vl) do { ait_val_t *__val = (_vl); assert(__val); \ + switch (AIT_TYPE(__val)) { \ case buffer: \ if (__val->val.buffer) { \ free(__val->val.buffer); \ @@ -245,7 +293,8 @@ inline const char *io_GetError(); /* - * io_ether_ntoa() Convert ethernet address to string + * io_ether_ntoa() - Convert ethernet address to string + * * @n = ethernet address structure, like struct ether_addr * @a = string * @len = string length @@ -253,27 +302,31 @@ inline const char *io_GetError(); */ inline char *io_ether_ntoa(const struct io_ether_addr *n, char * __restrict a, int len); /* - * io_ether_aton() Convert string to ethernet address + * io_ether_aton() - Convert string to ethernet address + * * @a = string * @e = ethernet address structure, like struct ether_addr * return: NULL error or !=NULL ethernet address structure */ inline struct io_ether_addr *io_ether_aton(const char *a, struct io_ether_addr *e); /* - * io_n2port() Extract port from network structure + * io_n2port() - Extract port from network structure + * * @addr = Address * return: 0 not supported family type or port number */ inline u_short io_n2port(io_sockaddr_t * __restrict addr); /* - * io_n2addr() Extract address from network structure + * io_n2addr() - Extract address from network structure + * * @addr = Address * @val = Value for store string address * return: NULL error or !=NULL string address from val */ const char *io_n2addr(io_sockaddr_t * __restrict addr, ait_val_t * __restrict val); /* - * io_gethostbyname() Get host and port and make network structure + * io_gethostbyname() - Get host and port and make network structure + * * @psHost = Hostname * @port = Port * @addr = Network address structure @@ -283,7 +336,8 @@ io_sockaddr_t *io_gethostbyname(const char *psHost, un io_sockaddr_t * __restrict addr); /* - * io_vars2buffer() Marshaling data from array with variables to buffer + * io_vars2buffer() - Marshaling data from array with variables to buffer + * * @buf = Buffer * @buflen = Size of buffer * @vars = Variable array @@ -291,7 +345,8 @@ io_sockaddr_t *io_gethostbyname(const char *psHost, un */ int io_vars2buffer(unsigned char *buf, int buflen, array_t *vars); /* - * io_buffer2vars() De-marshaling data from buffer to array with variables + * io_buffer2vars() - De-marshaling data from buffer to array with variables + * * @buf = Buffer * @buflen = Size of buffer * @vnum = Number of variables into buffer @@ -301,7 +356,8 @@ int io_vars2buffer(unsigned char *buf, int buflen, arr */ array_t *io_buffer2vars(unsigned char *buf, int buflen, int vnum, int zcpy); /* - * io_vars2map() Marshaling data from array with variables to memory map + * io_vars2map() - Marshaling data from array with variables to memory map + * * @buf = Buffer * @buflen = Size of buffer * @vars = Variable array @@ -309,7 +365,8 @@ array_t *io_buffer2vars(unsigned char *buf, int buflen */ int io_vars2map(unsigned char *buf, int buflen, array_t *vars); /* - * io_map2vars() De-marshaling data from memory map to array with variables + * io_map2vars() - De-marshaling data from memory map to array with variables + * * @buf = Buffer * @buflen = Size of buffer * @vnum = Number of variables into buffer @@ -320,38 +377,70 @@ int io_vars2map(unsigned char *buf, int buflen, array_ array_t *io_map2vars(unsigned char *buf, int buflen, int vnum, int zcpy); /* - * io_allocVar() Allocate memory for variable + * io_allocVar() - Allocate memory for variable + * * return: NULL error or new variable, after use free variable with io_freeVar() */ inline ait_val_t *io_allocVar(void); /* - * io_freeVar() Free allocated memory for variable + * io_freeVar() - Free allocated memory for variable + * * @val = Variable * return: none */ -inline void io_freeVar(ait_val_t * __restrict val); +inline void io_freeVar(ait_val_t ** __restrict val); /* - * io_allocVars() Allocate ait_val_t array + * io_allocVars() - Allocate ait_val_t array + * * @varnum = Number of variables * return: =NULL error or !=NULL allocated array */ inline array_t *io_allocVars(int varnum); /* - * io_clrVars() Clear ait_val_t elements from array + * io_clrVars() - Clear ait_val_t elements from array + * * @vars = Variable array * return: -1 error or size of array */ inline int io_clrVars(array_t * __restrict vars); /* - * io_freeVars() Free ait_val_t array + * io_freeVars() - Free ait_val_t array + * * @vars = Variable array * return: none */ inline void io_freeVars(array_t ** __restrict vars); +/* + * io_getVars() - Get ait_val_t element from array and if not exists allocate it + * + * @vars = Variable array + * @n = index of variable into array + * return: NULL error or !=NULL ait_val_t element + */ +inline ait_val_t *io_getVars(array_t ** __restrict vars, int n); +/* + * io_sortVars() - Sorting array with variables + * + * @vars = Variable array + * @order = Sort order. If =0 ascend ot !=0 descend + * @cmp = Compare function for sorting. If =NULL compare by key + * return: none + */ +inline void io_sortVars(array_t * __restrict vars, int order, + int (*cmp)(const void*, const void*)); +/* + * io_findKeyVars() - Find variable by key from array + * + * @vars = Variables + * @key = Search key + * return: NULL error or not found, !=NULL valid element + */ +ait_val_t *io_findKeyVars(array_t * __restrict vars, u_short key); /* - * ioPromptRead() Read data from input h[0] with prompt to output h[1] + * ioPromptRead() - Read data from input h[0] with prompt to output h[1] + * * @h = file handles h[0] = input, h[1] = output, if NULL use stdin, stdout * @csPrompt = Prompt before input, may be NULL * @psData = Readed data @@ -360,7 +449,8 @@ inline void io_freeVars(array_t ** __restrict vars); */ int ioPromptRead(int *h, const char *csPrompt, char * __restrict psData, int dataLen); /* - * ioPromptPassword() Read password from input h[0] with prompt to output h[1] + * ioPromptPassword() - Read password from input h[0] with prompt to output h[1] + * * @h = file handles h[0] = input, h[1] = output, if NULL use stdin, stdout * @csPrompt = Prompt before input, may be NULL * @psPass = Readed password @@ -371,7 +461,8 @@ int ioPromptRead(int *h, const char *csPrompt, char * int ioPromptPassword(int *h, const char *csPrompt, char * __restrict psPass, int passLen, int confirm); /* - * ioRegexVerify() Function for verify data match in regex expression + * ioRegexVerify() - Function for verify data match in regex expression + * * @csRegex = Regulare expression pattern * @csData = Data for check and verify * @startPos = Return start positions @@ -380,7 +471,8 @@ int ioPromptPassword(int *h, const char *csPrompt, cha */ const char *ioRegexVerify(const char *csRegex, const char *csData, int *startPos, int *endPos); /* - * ioRegexGet() Function for get data match in regex expression + * ioRegexGet() - Function for get data match in regex expression + * * @csRegex = Regulare expression pattern * @csData = Data from get * @psString = Returned string if match @@ -389,7 +481,8 @@ const char *ioRegexVerify(const char *csRegex, const c */ int ioRegexGet(const char *csRegex, const char *csData, char * __restrict psString, int strLen); /* - * ioRegexReplace() Function for replace data match in regex expression with newdata + * ioRegexReplace() - Function for replace data match in regex expression with newdata + * * @csRegex = Regulare expression pattern * @csData = Source data * @csNew = Data for replace @@ -398,45 +491,52 @@ int ioRegexGet(const char *csRegex, const char *csData char *ioRegexReplace(const char *csRegex, const char *csData, const char *csNew); /* - * ioStrAst() Function for evaluate string like asterisk variable "{text[:[-]#[:#]]}" + * ioStrAst() - Function for evaluate string like asterisk variable "{text[:[-]#[:#]]}" + * * @csString = Input string * return: NULL error, !=NULL Allocated new string evaluated from input string, must be free() */ char *ioStrAst(const char *csString); /* - * io_UnquotStr() Remove quots from input text string + * io_UnquotStr() - Remove quots from input text string + * * @psLine = Text string * return: 0 nothing to do; 1 successful unquoted string */ -inline int io_UnquotStr(unsigned char * __restrict psLine); +inline int io_UnquotStr(char * __restrict psLine); /* - * io_LTrimStr() Remove left whitespaces from text string + * io_LTrimStr() - Remove left whitespaces from text string + * * @psLine = Text string * return: 0 nothing to do; !=0 Removed bytes */ -inline int io_LTrimStr(unsigned char * __restrict psLine); +inline int io_LTrimStr(char * __restrict psLine); /* - * io_RTrimStr() Remove right whitespaces from text string + * io_RTrimStr() - Remove right whitespaces from text string + * * @psLine = Text string * return: 0 nothing to do; !=0 Removed bytes */ -inline int io_RTrimStr(unsigned char * __restrict psLine); +inline int io_RTrimStr(char * __restrict psLine); /* - * io_TrimStr() Remove left and right whitespaces from text string + * io_TrimStr() - Remove left and right whitespaces from text string + * * @psLine = Text string * return: 0 nothing to do; !=0 Removed bytes */ -inline int io_TrimStr(unsigned char * __restrict psLine); +inline int io_TrimStr(char * __restrict psLine); /* - * io_Ch2Hex() Convert from Char string to Hex string + * io_Ch2Hex() - Convert from Char string to Hex string + * * @psLine = Text string * @lineLen = Length of Text string * return: NULL nothing to do or error; !=0 Allocated new converted data without term\0 (must be free) */ inline unsigned char *io_Ch2Hex(unsigned char *psLine, int lineLen); /* - * io_Hex2Ch() Convert from Hex string to Char string + * io_Hex2Ch() - Convert from Hex string to Char string + * * @psLine = Text string * @lineLen = Length of Text string * return: NULL nothing to do or error; !=0 Allocated new converted string(must be free) @@ -459,12 +559,14 @@ io_Path2File(const char * __restrict csArgs, char * __ /* * io_arrayInit() - Create and initialize dynamic array + * * @numItems = Number of Items * return: NULL error, != NULL allocated memory for array */ inline array_t *io_arrayInit(int numItems); /* * io_arrayDestroy() - Free and destroy dynamic array + * * @parr = Array * return: none */ @@ -472,12 +574,14 @@ inline void io_arrayDestroy(array_t ** __restrict parr /* * io_arrayFree() - Free all data in dynamic array items * (WARNING! If assign static array dont use this!!!) + * * @arr = Array * return: none */ inline void io_arrayFree(array_t * __restrict arr); /* * io_arrayFrom() - Create and fill array from array with pointers + * * @pargv = Array with pointers * @argc = Number of Items, if 0 walk through argv and stop when reach NULL item * return: NULL error, != NULL allocated new array @@ -485,18 +589,21 @@ inline void io_arrayFree(array_t * __restrict arr); inline array_t *io_arrayFrom(const char *** __restrict pargv, int argc); /* * io_arrayTo() - Create and fill array with pointers from dynamic array + * * @arr = Array * return: NULL error, != NULL allocated memory for array, NULL terminated */ inline char **io_arrayTo(array_t * __restrict arr); /* * io_arrayLen() - Get last used element in dynamic array (array Length) + * * @arr = Array - * return: -1 error, 0 empty or >0 position of last used element + * return: -1 empty or >-1 position of last used element */ inline int io_arrayLen(array_t * __restrict arr); /* * io_arrayConcat() Concat source array to destination array + * * @dest = Destination array * @src = Source array * return: -1 error; >0 new count of destination array @@ -504,6 +611,7 @@ inline int io_arrayLen(array_t * __restrict arr); int io_arrayConcat(array_t * __restrict dest, array_t * __restrict src); /* * io_arrayCopy() Copy source array to destination array + * * @dest = Destination array, after use free with io_arrayDestroy() * @src = Source array * return: -1 error; >0 count of destination array @@ -511,6 +619,7 @@ int io_arrayConcat(array_t * __restrict dest, array_t int io_arrayCopy(array_t ** __restrict dest, array_t * __restrict src); /* * io_arrayGrow() - Grow/Shrink dynamic array, Use with care when it shrink!!! + * * @arr = Array * @newNumItems = Number of Items * @freeShrink = Free elements before shrink array @@ -519,6 +628,7 @@ int io_arrayCopy(array_t ** __restrict dest, array_t * int io_arrayGrow(array_t * __restrict arr, int newNumItems, int freeShrink); /* * io_arrayVacuum() - Vacuum dynamic array, empty elements will be deleted + * * @arr = Array * @fromWhere = 1 begin, 2 ALL empty elements * return: -1 error, 0 ok @@ -526,25 +636,30 @@ int io_arrayGrow(array_t * __restrict arr, int newNumI int io_arrayVacuum(array_t * __restrict arr, int fromWhere); #define io_arraySize(_arr) ((_arr) ? (_arr)->arr_num : 0) +#define io_arrayLast(_arr) (io_arraySize((_arr)) ? (_arr)->arr_last : -1) #define io_arrayZero(_arr) (assert((_arr)), memset((_arr)->arr_data, 0, \ io_arraySize((_arr)) * sizeof(void*))) -#define io_arrayGet(_arr, _d) (assert((_arr) && (_arr)->arr_num > _d), *((_arr)->arr_data + _d)) +#define io_arrayGet2(_arr, _d) (assert((_arr) && (_arr)->arr_num > _d), ((_arr)->arr_data + _d)) +#define io_arrayGet(_arr, _d) (assert((_arr) && (_arr)->arr_num > _d), (_arr)->arr_data[_d]) #define io_array(_arr, _d, _type) (assert((_arr) && (_arr)->arr_num > _d), \ - ((_type) *((_arr)->arr_data + _d))) + ((_type) (_arr)->arr_data[_d])) #define io_arraySet(_arr, _d, _ptr) do { \ assert((_arr) && (_arr)->arr_num > _d); \ - *((_arr)->arr_data + _d) = (void*) (_ptr); \ + if ((_arr)->arr_last < _d) \ + (_arr)->arr_last = _d; \ + (_arr)->arr_data[_d] = (void*) (_ptr); \ } while (0) #define io_arrayDel(_arr, _d, _fri) do { \ assert((_arr) && (_arr)->arr_num > _d); \ - if (_fri) \ - free(*((_arr)->arr_data + _d)); \ - *((_arr)->arr_data + _d) = NULL; \ + if (_fri && (_arr)->arr_data[_d]) \ + free((_arr)->arr_data[_d]); \ + (_arr)->arr_data[_d] = NULL; \ } while (0) /* * io_arrayElem() - Always GET/PUT element into dynamic array, if not enough elements grow array + * * @arr = Array * @n = Position * @data = Element, if set NULL GET element at position or !=NULL PUT element at position @@ -553,13 +668,16 @@ int io_arrayVacuum(array_t * __restrict arr, int fromW inline void *io_arrayElem(array_t * __restrict arr, int n, void *data); /* * io_arrayPush() - Push element into dynamic array like stack manner, place at first empty position + * * @arr = Array * @data = Element, if set NULL return only first empty position + * @mayGrow = Array may to grow, if not enough room for new element * return: -1 not found empty position, array is full!, >-1 return position of stored element into array */ -inline int io_arrayPush(array_t * __restrict arr, void **data); +inline int io_arrayPush(array_t * __restrict arr, void **data, int mayGrow); /* * io_arrayPop() - Pop element from dynamic array like stack manner, last used position + * * @arr = Array * @data = Element, if set NULL return only last used position * @delAfter = Delete after Pop element, !=0 delete element from array after return data @@ -568,7 +686,8 @@ inline int io_arrayPush(array_t * __restrict arr, void inline int io_arrayPop(array_t * __restrict arr, void ** __restrict data, int delAfter); /* - * io_argsNum() Parse and calculate number of arguments + * io_argsNum() - Parse and calculate number of arguments + * * @csArgs = Input arguments line * @csDelim = Delimiter(s) for separate * return: 0 error format; -1 error:: can`t read; >0 ok, number of items @@ -576,8 +695,9 @@ inline int io_arrayPop(array_t * __restrict arr, void inline int io_argsNum(const char *csArgs, const char *csDelim); /* - * io_arrayMake() Parse and make array from arguments ... (input string will be modified!!! + * io_arrayMake() - Parse and make array from arguments ... (input string will be modified!!! * and output array must be free with io_arrayDestroy() 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 * @csDelim = Delimiter(s) for separate @@ -588,7 +708,8 @@ int io_arrayMake(char * __restrict psArgs, int nargs, array_t ** __restrict parr); /* - * io_MakeAV() Parse and make attribute/value pair + * io_MakeAV() - Parse and make attribute/value pair + * * @csArgs = Input argument line * @csDelim = Delimiter for separate * @psAttr = Output Attribute @@ -602,6 +723,7 @@ int io_MakeAV(const char * __restrict csArgs, const ch /* * io_sarrInit() - Create and initialize dynamic split-order array + * * @numItems = Number of Items * @segLen = Length of segment * return: NULL error, != NULL allocated memory for array @@ -609,12 +731,14 @@ int io_MakeAV(const char * __restrict csArgs, const ch inline sarr_t *io_sarrInit(int numItems, int segLen); /* * io_sarrDestroy() - Free all data in dynamic split-order array and Destroy array + * * @parr = Array * return: none */ inline void io_sarrDestroy(sarr_t ** __restrict parr); /* * io_sarrGrow() - Grow/Shrink dynamic split-order array, Use with care when it shrink!!! + * * @arr = Array * @newNumItems = Number of Items * return: -1 error, 0 ok @@ -622,6 +746,7 @@ inline void io_sarrDestroy(sarr_t ** __restrict parr); int io_sarrGrow(sarr_t * __restrict arr, int newNumItems); /* * io_sarrVacuum() - Vacuum dynamic split-order array, empty segments will be freed + * * @arr = Array * return: -1 error, >-1 freed segments */ @@ -630,6 +755,7 @@ inline int io_sarrVacuum(sarr_t * __restrict arr); #define io_sarrSeg(_arr) (assert((_arr)), (_arr)->sarr_seg) /* * io_sarrCopy() Copy source split array to destination split array + * * @dest = Destination split array, after use free with io_sarrDestroy() * @src = Source split array * return: -1 error; >0 count of destination split array @@ -637,6 +763,7 @@ inline int io_sarrVacuum(sarr_t * __restrict arr); int io_sarrCopy(sarr_t ** __restrict dest, sarr_t * __restrict src); /* * io_sarrGet() - Get element from dynamic split-order array + * * @arr = Array * @idx = Index (warning 1st element is at position 1) * return: NULL not found, !=NULL element @@ -645,6 +772,7 @@ inline void *io_sarrGet(sarr_t * __restrict arr, unsig /* * io_sarrGet2() - Always get element from dynamic split-order array * Function automatic grow array. Good use for Hash tables! + * * @arr = Array * @idx = Index (warning 1st element is at position 1) * return: NULL not found, !=NULL element @@ -652,6 +780,7 @@ inline void *io_sarrGet(sarr_t * __restrict arr, unsig void *io_sarrGet2(sarr_t * __restrict arr, unsigned int idx); /* * io_sarrSet() - Set element to dynamic split-order array + * * @arr = Array * @idx = Index (warning 1st element is at position 1) * @data = Value @@ -662,6 +791,7 @@ inline void *io_sarrSet(sarr_t * __restrict arr, unsig #define io_sarr(_arr, _idx, _type) (_type)io_sarrGet((_arr), _idx) /* * io_sarr2array() - Convert from split-order array to dynamic array + * * @sa = split array * @sarrFree = after convert split array !=0 will be destroyed sarray * return: NULL error or != NULL new array @@ -669,6 +799,7 @@ inline void *io_sarrSet(sarr_t * __restrict arr, unsig array_t *io_sarr2array(sarr_t ** __restrict sa, int sarrFree); /* * io_array2sarr() - Convert from dynamic array to split-order array + * * @a = array * @segLen = Length of segment * @arrFree = after convert array !=0 will be destroyed @@ -677,27 +808,31 @@ array_t *io_sarr2array(sarr_t ** __restrict sa, int sa sarr_t *io_array2sarr(array_t ** __restrict a, int segLen, int arrFree); /* - * io_CopyEnv() Copy environment to new environment array; + * io_CopyEnv() - Copy environment to new environment array; + * * @oldenv = Environment array * return: NULL error; !=NULL Allocated new environment array(must be free) */ char **io_CopyEnv(const char **oldenv); /* - * io_ExecArgs() Build exec arguments from other array + * io_ExecArgs() - Build exec arguments from other array + * * @psProg = Program name for execute * @oldarg = Arguments array * return: NULL error; !=NULL Allocated execution array(must be free) */ char **io_ExecArgs(const char *psProg, const char **oldarg); /* - * io_FreeNullTerm() Free dynamic allocated null terminated array with strings + * io_FreeNullTerm() - Free dynamic allocated null terminated array with strings + * * @arr = Pointer to array for free * return: none */ inline void io_FreeNullTerm(char *** __restrict arr); /* - * ioMkDir() Function for racursive directory creation and validation + * ioMkDir() - Function for racursive directory creation and validation + * * @csDir = Full directory path * @mode = Mode for directory creation if missing dir * return: -1 error, 0 directory path exist, >0 created missing dirs @@ -705,7 +840,8 @@ inline void io_FreeNullTerm(char *** __restrict arr); int ioMkDir(const char *csDir, int mode); /* - * ioWatchDirLoop() Function for watching changes in directory and fire callback + * ioWatchDirLoop() - Function for watching changes in directory and fire callback + * * @csDir = Full directory path * @callback = Callback if raise event! nOp -1 delete, 0 change/move, 1 create * return: -1 error, !=-1 ok, number of total signaled events @@ -714,7 +850,8 @@ int ioWatchDirLoop(const char *csDir, int (*callback)( /* - * io_rread() Raw VFS read function + * io_rread() - Raw VFS read function + * * @fd = File handle * @buf = Read buffer * @nbytes = Read buffer size @@ -724,7 +861,8 @@ int ioWatchDirLoop(const char *csDir, int (*callback)( */ inline int io_rread(int fd, void * __restrict buf, size_t nbytes, off_t offset, int update); /* - * io_rwrite() Raw VFS write function + * io_rwrite() - Raw VFS write function + * * @fd = File handle * @buf = Write buffer * @nbytes = Write bytes from buffer @@ -794,7 +932,8 @@ extern int io_Debug; /* Crypto framework */ /* - * ioCipher() Cipher wrapper for all supported crypto algorythms + * ioCipher() - Cipher wrapper for all supported crypto algorythms + * * @pInput = input buffer * @inLen = input buffer len * @ppOutput = output allocated buffe, must be free after use @@ -808,7 +947,8 @@ int ioCipher(unsigned char *pInput, int inLen, unsigne unsigned char *pKey, unsigned char *pIV, int nMode); /* - * io_Blowfish() Blowfish cipher algorythm, work with ASCII hex strings + * io_Blowfish() - Blowfish cipher algorythm, work with ASCII hex strings + * * @pInput = input buffer * @inLen = input buffer len * @ppOutput = output allocated buffe, must be free after use @@ -820,7 +960,8 @@ int ioCipher(unsigned char *pInput, int inLen, unsigne int io_Blowfish(unsigned char *pInput, int inLen, unsigned char **ppOutput, unsigned char *pKey, unsigned char *pIV, int nMode); /* - * io_ctr_AES() Encrypt/Decrypt stream cipher CTR_AES + * io_ctr_AES() - Encrypt/Decrypt stream cipher CTR_AES + * * @pInput = Input buffer with ASCII * @inLen = Input buffer data length * @ppOutput = Output buffer with cipher data, must be free after use @@ -833,7 +974,8 @@ int io_ctr_AES(unsigned char *pInput, int inLen, unsig /* - * ioAllocPTY() Allocate new PTY and TTY + * ioAllocPTY() - Allocate new PTY and TTY + * * @ptyfd = master fd, pty * @ttyfd = slave fd, tty * @name = tty device name if not null @@ -845,14 +987,16 @@ int io_ctr_AES(unsigned char *pInput, int inLen, unsig inline int ioAllocPTY(int *ptyfd, int *ttyfd, char * __restrict name, int namesiz, struct termios * __restrict term, struct winsize * __restrict winz); /* - * ioFreePTY() Release PTY and TTY device + * ioFreePTY() - Release PTY and TTY device + * * @ptyfd = master fd, pty (==-1 skip closing pty) * @ttyname = tty filename * return: none */ inline void ioFreePTY(int ptyfd, const char *ttyname); /* - * ioChgWinPTY() Change window size of PTY + * ioChgWinPTY() - Change window size of PTY + * * @ptyfd = master fd, pty * @row = row * @col = col @@ -863,7 +1007,8 @@ inline void ioFreePTY(int ptyfd, const char *ttyname); inline int ioChgWinPTY(int ptyfd, unsigned short row, unsigned short col, unsigned short xpxl, unsigned short ypxl); /* - * ioSetOwnerTTY() Set owner to TTY + * ioSetOwnerTTY() - Set owner to TTY + * * @ttyname = tty filename * @UID = uid * @GID = gid @@ -871,28 +1016,32 @@ inline int ioChgWinPTY(int ptyfd, unsigned short row, */ int ioSetOwnerTTY(const char *ttyname, uid_t UID, gid_t GID); /* - * ioSetSidTTY() Makes the process's controlling TTY and sets it to sane modes. + * ioSetSidTTY() - Makes the process's controlling TTY and sets it to sane modes. + * * @ttyfd = slave fd, tty * @ttyname = tty filename * return: -1 error or 0 ok */ int ioSetSidTTY(int *ttyfd, const char *ttyname); /* - * ioSetRAWMode() Enter into RAW mode + * ioSetRAWMode() - Enter into RAW mode + * * @fd = tty fd * @otio = saved old termios for later restore if !=NULL * return: -1 error or 0 ok */ inline int ioSetRAWMode(int fd, struct termios *otio); /* - * ioRestoreMode() Restore termios to tty fd + * ioRestoreMode() - Restore termios to tty fd + * * @fd = tty fd * @tio = termios structure for restore * return: -1 error or 0 ok */ inline int ioRestoreMode(int fd, struct termios tio); /* - * ioForkPTY() Fork new process with session leader and new TTY + * ioForkPTY() - Fork new process with session leader and new TTY + * * @ptyfd = master fd, pty * @name = tty device name if not null * @namesiz = name length, must be above 63 bytes. @@ -905,7 +1054,8 @@ pid_t ioForkPTY(int *ptyfd, char * __restrict name, in struct winsize * __restrict winz, struct termios * __restrict otio); /* - * ioCreatePIDFile() Create PID file + * ioCreatePIDFile() - Create PID file + * * @csName = PID filename * @ifExists = !=0 if filename exists return error * return: -1 error or 0 ok @@ -913,7 +1063,8 @@ pid_t ioForkPTY(int *ptyfd, char * __restrict name, in inline int ioCreatePIDFile(const char *csName, int ifExists); /* - * ioSendFile() AITNET sendfile() userland implementation, not dependant from OS + * ioSendFile() - AITNET sendfile() userland implementation, not dependant from OS + * * @s = socket * @csFile = file for send * @sendLen = bytes to send, if 0 send all data @@ -923,7 +1074,8 @@ inline int ioCreatePIDFile(const char *csName, int ifE */ size_t ioSendFile(int s, const char *csFile, size_t sendLen, off_t offset, int sndbuf); /* - * ioRecvFile() Receive file from socket, fastest (zero-copy) way + * ioRecvFile() - Receive file from socket, fastest (zero-copy) way + * * @s = socket * @csFile = file for receive * @recvLen = receive bytes @@ -937,7 +1089,7 @@ size_t ioRecvFile(int s, const char *csFile, size_t re /* Buffered file access over memory block */ /* - * io_fmemopen() File buffered stream operations over memory block + * io_fmemopen() - File buffered stream operations over memory block * * @base = Base address of memory block, if =NULL Infinit length(auto-grow) * @basesize = Size of memory block @@ -945,7 +1097,7 @@ size_t ioRecvFile(int s, const char *csFile, size_t re */ FILE *io_fmemopen(void ** __restrict base, off_t basesize); /* - * io_fmapopen() File buffered stream operations over MMAP block + * io_fmapopen() - File buffered stream operations over MMAP block * * @csFile = Filename for MMAP, if =NULL private MMAP block * @mode = File open mode @@ -957,7 +1109,7 @@ FILE *io_fmemopen(void ** __restrict base, off_t bases */ FILE *io_fmapopen(const char *csFile, int mode, int perm, int prot, int flags, off_t offset); /* - * io_fd2buf() Convert open file handle to buffered file I/O + * io_fd2buf() - Convert open file handle to buffered file I/O * * @fd = File handle * @mode = Permissions for new buffered file I/O @@ -965,7 +1117,7 @@ FILE *io_fmapopen(const char *csFile, int mode, int pe */ inline FILE *io_fd2buf(int fd, const char *mode); /* - * io_dumbFile() Create empry or dumb file with fixed size + * io_dumbFile() - Create empry or dumb file with fixed size * * @csFile = Filename for create * @mode = File access permissions