--- libaitwww/src/aitwww.c 2012/03/09 09:38:55 1.1.1.1.2.1 +++ libaitwww/src/aitwww.c 2012/03/09 12:33:41 1.1.1.1.2.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitwww.c,v 1.1.1.1.2.1 2012/03/09 09:38:55 misho Exp $ +* $Id: aitwww.c,v 1.1.1.1.2.3 2012/03/09 12:33:41 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -324,7 +324,7 @@ www_addValue(cgi_t * __restrict cgi, const char *name, int www_delPair(cgi_t * __restrict cgi, const char *name) { - struct tagCGI *t; + struct tagCGI *t, *tmp; if (!cgi || !name) { www_SetErr(EINVAL, "Invalid argument(s)"); @@ -332,13 +332,48 @@ www_delPair(cgi_t * __restrict cgi, const char *name) } /* search for delete */ - SLIST_FOREACH(t, cgi, cgi_node) + SLIST_FOREACH_SAFE(t, cgi, cgi_node, tmp) if (t->cgi_name && !strcmp(name, t->cgi_name)) { SLIST_REMOVE(cgi, t, tagCGI, cgi_node); + + if (t->cgi_name) + free(t->cgi_name); + if (t->cgi_value) + free(t->cgi_value); + free(t); return 1; } return 0; +} + +/* + * www_listPairs() - Walk over CGI session variables + * + * @cgi = Cgi session + * @func = If !=NULL call function for each element + * @arg = Optional argument pass through callback + * return: -1 error or >-1 number of elements + */ +inline int +www_listPairs(cgi_t * __restrict cgi, list_cb_t func, void *arg) +{ + register int ret = 0; + struct tagCGI *t; + + if (!cgi) { + www_SetErr(EINVAL, "Invalid CGI session argument"); + return -1; + } + + SLIST_FOREACH(t, cgi, cgi_node) { + ret++; + + if (func) + func(t, arg); + } + + return ret; } /*