--- libaitio/inc/aitio.h	2011/11/02 16:10:24	1.12.2.4
+++ libaitio/inc/aitio.h	2011/12/12 12:42:27	1.12.2.8
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.12.2.4 2011/11/02 16:10:24 misho Exp $
+* $Id: aitio.h,v 1.12.2.8 2011/12/12 12:42:27 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -124,6 +124,7 @@ typedef enum {
 
 typedef struct {
 	uint8_t		val_type;
+	uint8_t		val_pad[3];
 	uint32_t	val_len;
 	union {
 		uint64_t	net;
@@ -274,15 +275,15 @@ inline char *io_ether_ntoa(const struct io_ether_addr 
 inline struct io_ether_addr *io_ether_aton(const char *a, struct io_ether_addr *e);
 
 /*
- * io_vals2buffer() 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
  * return: -1 error, 0 nothing done or >0 size of marshaled data
  */
-int io_vals2buffer(unsigned char *buf, int buflen, array_t *vars);
+int io_vars2buffer(unsigned char *buf, int buflen, array_t *vars);
 /*
- * io_buffer2vals() 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
@@ -290,17 +291,17 @@ int io_vals2buffer(unsigned char *buf, int buflen, arr
  		*DON'T MODIFY OR DESTROY BUFFER*. =0 call io_arrayFree() before io_arrayDestroy()
  * return: =NULL error, !=NULL allocated variable array, after use must free with io_arrayDestroy()
  */
-array_t *io_buffer2vals(unsigned char *buf, int buflen, int vnum, int zcpy);
+array_t *io_buffer2vars(unsigned char *buf, int buflen, int vnum, int zcpy);
 /*
- * io_vals2map() 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
  * return: -1 error, 0 nothing done or >0 size of marshaled data
  */
-int io_vals2map(u_char *buf, int buflen, array_t *vars);
+int io_vars2map(u_char *buf, int buflen, array_t *vars);
 /*
- * io_map2vals() 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
@@ -308,9 +309,28 @@ int io_vals2map(u_char *buf, int buflen, array_t *vars
  		*DON'T MODIFY OR DESTROY BUFFER*. =0 call io_arrayFree() before io_arrayDestroy()
  * return: =NULL error, !=NULL allocated variable array, after use must free with io_arrayDestroy()
  */
-array_t *io_map2vals(u_char *buf, int buflen, int vnum, int zcpy);
+array_t *io_map2vars(u_char *buf, int buflen, int vnum, int zcpy);
 
 /*
+ * io_allocVars() Allocate ait_val_t array
+ * @varnum = Number of variables
+ * return: =NULL error or !=NULL allocated array
+ */
+inline array_t *io_allocVars(u_int varnum);
+/*
+ * io_clrVars() Clear ait_val_t elements from array
+ * @vars = Variable array
+ * return: size of array
+ */
+inline int io_clrVars(array_t * __restrict vars);
+/*
+ * io_freeVars() Free ait_val_t array
+ * @vars = Variable array
+ * return: none
+ */
+inline void io_freeVars(array_t ** __restrict vars);
+
+/*
  * 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
@@ -358,11 +378,11 @@ int ioRegexGet(const char *csRegex, const char *csData
 char *ioRegexReplace(const char *csRegex, const char *csData, const char *csNew);
 
 /*
- * ioVarAst() 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 *ioVarAst(const char *csString);
+char *ioStrAst(const char *csString);
 
 /*
  * io_Path2File() Parse and make path/filename pair