--- libaitio/src/Attic/vars.c 2011/11/03 14:22:04 1.2.2.2 +++ libaitio/src/Attic/vars.c 2011/11/03 14:56:48 1.2.2.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: vars.c,v 1.2.2.2 2011/11/03 14:22:04 misho Exp $ +* $Id: vars.c,v 1.2.2.3 2011/11/03 14:56:48 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -454,6 +454,23 @@ io_allocVars(u_int varnum) } /* + * io_clrVars() Clear ait_val_t elements from array + * @vars = Variable array + * return: none + */ +inline int +io_clrVars(array_t * __restrict vars) +{ + register int i; + + for (i = 0; i < io_arraySize(vars); i++) + if (io_arrayGet(vars, i)) + AIT_FREE_VAL(io_array(vars, i, ait_val_t*)); + + return io_arraySize(vars); +} + +/* * io_freeVars() Free ait_val_t array * @vars = Variable array * return: none @@ -461,15 +478,10 @@ io_allocVars(u_int varnum) inline void io_freeVars(array_t ** __restrict vars) { - register int i; - if (!vars || !*vars) return; - for (i = 0; i < io_arraySize(*vars); i++) - if (io_arrayGet(*vars, i)) - AIT_FREE_VAL(io_array(*vars, i, ait_val_t*)); - + io_clrVars(*vars); io_arrayFree(*vars); io_arrayDestroy(vars); }