--- libaitio/inc/aitio.h 2012/08/08 16:01:16 1.24.2.2 +++ libaitio/inc/aitio.h 2012/09/03 12:18:27 1.25.2.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitio.h,v 1.24.2.2 2012/08/08 16:01:16 misho Exp $ +* $Id: aitio.h,v 1.25.2.2 2012/09/03 12:18:27 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -245,6 +245,8 @@ typedef struct { void *__p = io_realloc(__val->val.string, AIT_LEN(__val) + __l); \ if (__p) { \ AIT_LEN(__val) += __l; \ + if (!__val->val.string) \ + memset(__p, 0, AIT_LEN(__val)); \ __val->val.string = __p; \ strlcat((char*) __val->val.string, __s, \ AIT_LEN(__val)); \ @@ -547,6 +549,23 @@ inline void io_freeVar(ait_val_t ** __restrict val); */ ait_val_t *io_makeVar(ait_type_t type, ...); /* + * io_sprintfVar() - Builtin string variable from formatted input + * + * @v = variable + * @fmt = format string + * @... = argument(s) + * return: -1 error or >0 copied bytes to variable + */ +int io_sprintfVar(ait_val_t * __restrict v, const char *fmt, ...); +/* + * io_hashVar() - Generate hash key for variable from string or value + * + * @v = variable + * @key = key string for hash, if =NULL hash will built from variable + * return: hash key + */ +unsigned short io_hashVar(ait_val_t * __restrict v, const char * __restrict key); +/* * io_allocVars() - Allocate ait_val_t array * * @varnum = Number of variables @@ -601,6 +620,21 @@ inline void io_sortVarsByVal(array_t * __restrict vars * return: NULL error or not found, !=NULL valid element */ ait_val_t *io_findKeyVars(array_t * __restrict vars, u_short key); +/* + * io_findKeyHash() - Find variable by hash string from array + * + * @vars = Variables + * @key = Search string + * return: NULL error or not found, !=NULL valid element + */ +inline ait_val_t *io_findKeyHash(array_t * __restrict vars, const char * __restrict key); +/* + * io_hashKeyVars() - Generate hash keys for variables + * + * @vars = Variables + * return -1 error or 0 ok + */ +inline int io_hashKeyVars(array_t * __restrict vars); /*