--- libaitcfg/src/queue.c 2014/04/14 19:58:21 1.16 +++ libaitcfg/src/queue.c 2019/12/05 14:33:35 1.18 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: queue.c,v 1.16 2014/04/14 19:58:21 misho Exp $ +* $Id: queue.c,v 1.18 2019/12/05 14:33:35 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004 - 2014 +Copyright 2004 - 2019 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -80,6 +80,37 @@ _selectAttribute(cfg_root_t * __restrict cfg, const ch /* --------------------------------------------------------------- */ /* + * cfg_dumpCfg() - dump config data + * + * @cfg = Config root + * return: none + */ +void +cfg_dumpCfg(cfg_root_t * __restrict cfg) +{ + struct tagCfg *r, *c, *ctmp, *q, *qtmp; + int syn; + + r = RB_ROOT(cfg); + printf("ROOT:: KEY=%.8x [%s] %s=%s\n", ((AIT_KEY(&r->cfg_sec) << 15) | AIT_KEY(&r->cfg_attr)), + AIT_ADDR(&r->cfg_sec), AIT_ADDR(&r->cfg_attr), AIT_ADDR(&r->cfg_val)); + + RB_FOREACH_SAFE(c, tagRC, cfg, ctmp) { + syn ^= syn; + TAILQ_FOREACH_SAFE(q, cfg, cfg_next, qtmp) { + if (c == q) { + syn = 42; + break; + } + } + + printf("%s KEY=%.8x [%s] %s=%s sync=%d\n", c == r ? "*" : "", + ((AIT_KEY(&c->cfg_sec) << 15) | AIT_KEY(&c->cfg_attr)), + AIT_ADDR(&c->cfg_sec), AIT_ADDR(&c->cfg_attr), AIT_ADDR(&c->cfg_val), syn); + } +} + +/* * cfg_getSection() - Get entire section attributes into array * * @cfg = Config root @@ -104,35 +135,26 @@ cfg_getSection(cfg_root_t * __restrict cfg, const char AIT_KEY(&fav.cfg_sec) = crcFletcher16((u_short*) csSec, E_ALIGN(strlen(csSec), 2) / 2); - av = RB_NFIND(tagRC, cfg, &fav); - if (!av) - return NULL; - if (csSec) { - if (AIT_ISEMPTY(&av->cfg_sec) || strcmp(AIT_GET_STR(&av->cfg_sec), csSec)) - return NULL; - } else { - if (!AIT_ISEMPTY(&av->cfg_sec)) - return NULL; - } - - arr = array_Init(1); + arr = array_Init(0); if (!arr) { cfg_SetErr(elwix_GetErrno(), "%s", elwix_GetError()); return NULL; - } else - array_Push(arr, av, 0); + } - while ((av = RB_NEXT(tagRC, cfg, av)) && av) { - if (csSec) { - if (AIT_ISEMPTY(&av->cfg_sec) || strcmp(AIT_GET_STR(&av->cfg_sec), csSec)) - break; - } else { - if (!AIT_ISEMPTY(&av->cfg_sec)) - break; + TAILQ_FOREACH(av, cfg, cfg_next) + if (AIT_KEY(&av->cfg_sec) == AIT_KEY(&fav.cfg_sec)) { + if (!csSec) { + if (AIT_ISEMPTY(&av->cfg_sec)) + array_Push(arr, av, 0); + } else { + if (!AIT_ISEMPTY(&av->cfg_sec) && + !strcmp(AIT_GET_STR(&av->cfg_sec), csSec)) + array_Push(arr, av, 0); + } } - array_Push(arr, av, 0); - } + if (!array_Size(arr)) + array_Destroy(&arr); return arr; }