--- libaitcfg/src/queue.c 2012/04/02 15:12:15 1.6.4.2 +++ libaitcfg/src/queue.c 2012/04/02 16:11:13 1.6.4.5 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: queue.c,v 1.6.4.2 2012/04/02 15:12:15 misho Exp $ +* $Id: queue.c,v 1.6.4.5 2012/04/02 16:11:13 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -63,16 +63,6 @@ _selectAttribute(cfg_root_t * __restrict cfg, const ch AIT_KEY(&fav.cfg_attr) = crcFletcher16((u_short*) csAttr, io_align(strlen(csAttr), 1) / 2); - /* - struct tagCfg *av; - - RB_FOREACH(av, tagRC, cfg) { - printf("sec=%s(%d) attr=%s(%d) val=%s\n", AIT_GET_LIKE(&av->cfg_sec, char*), AIT_KEY(&av->cfg_sec), - AIT_GET_LIKE(&av->cfg_attr, char*), AIT_KEY(&av->cfg_attr), AIT_GET_STR(&av->cfg_val)); - } - - printf("ssss=%d aaaa=%d\n", AIT_KEY(&fav.cfg_sec), AIT_KEY(&fav.cfg_attr)); - */ if (!csAttr) return RB_NFIND(tagRC, cfg, &fav); else @@ -85,13 +75,9 @@ _destroyAttribute(struct tagCfg *av) if (!av) return; - AIT_FREE_VAL(&av->cfg_val); - AIT_FREE_VAL(&av->cfg_attr); - AIT_FREE_VAL(&av->cfg_sec); - free(av); } -// ---------------------------------------------- +/* --------------------------------------------------------------- */ /* * cfg_findAttribute() - Find attribute position in config file @@ -128,46 +114,38 @@ cfg_findAttribute(cfg_root_t * __restrict cfg, const c return 0; } -#if 0 + /* - * cfg_UnsetAttribute() Unset item from config list and free resources - * @cfg = Head list element + * cfg_unsetAttribute() - Unset item from config and free resources + * + * @cfg = Config root * @csSec = Config section //[{csSec}], if NULL unset in *default* section - * @csAttr = Config attribute //{csAttr} = ..., if NULL unset as *any* attribute - * return: 0 item not found, -1 error: null parameters; >0 position in list -*/ -int cfg_UnsetAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr) + * @csAttr = Config attribute //{csAttr} = ... + * return: 0 item not found, -1 error or 1 removed item + */ +int +cfg_unsetAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr) { - struct tagPair *av, *curr; - register int cx = 0; + struct tagCfg *av; if (!cfg || !csAttr) return -1; - av = SelectAttribute(cfg, csSec, csAttr); + av = _selectAttribute(cfg, csSec, csAttr); if (!av) return 0; - // remove element - // remove element when is first! - if (cfg->slh_first == av) { - cfg->slh_first = cfg->slh_first->sle_next; + CFG_RC_LOCK(cfg); + RB_REMOVE(tagRC, cfg, av); + SLIST_REMOVE(cfg, av, tagCfg, cfg_next); + CFG_RC_UNLOCK(cfg); - DestroyAttribute(av); - return 1; - } - // remove element in other cases... - curr = cfg->slh_first; - while (curr->sle_next != av) { - ++cx; - curr = curr->sle_next; - } - curr->sle_next = curr->sle_next->sle_next; - - DestroyAttribute(av); - return cx; + AIT_FREE_VAL(&av->cfg_val); + AIT_FREE_VAL(&av->cfg_attr); + AIT_FREE_VAL(&av->cfg_sec); + free(av); + return 1; } -#endif /* * cfg_setAttribute() - Set item in config or adding new item if not exists @@ -183,7 +161,7 @@ cfg_setAttribute(cfg_root_t * __restrict cfg, const ch { struct tagCfg *av, *section; - if (!cfg || !csAttr || !csVal) + if (!cfg || !csAttr) return -1; av = _selectAttribute(cfg, csSec, csAttr); @@ -211,7 +189,7 @@ cfg_setAttribute(cfg_root_t * __restrict cfg, const ch AIT_KEY(&av->cfg_sec) = crcFletcher16(AIT_GET_LIKE(&av->cfg_sec, u_short*), io_align(AIT_LEN(&av->cfg_sec) - 1, 1) / 2); } - AIT_SET_STR(&av->cfg_val, csVal); + AIT_SET_STR(&av->cfg_val, csVal ? csVal : ""); AIT_SET_STR(&av->cfg_attr, csAttr); AIT_KEY(&av->cfg_attr) = crcFletcher16(AIT_GET_LIKE(&av->cfg_attr, u_short*), io_align(AIT_LEN(&av->cfg_attr) - 1, 1) / 2); @@ -222,7 +200,7 @@ cfg_setAttribute(cfg_root_t * __restrict cfg, const ch return 2; } - if (strcmp((char*) csVal, (char*) AIT_GET_STR(&av->cfg_val))) { + if (csVal && strcmp((char*) csVal, (char*) AIT_GET_STR(&av->cfg_val))) { /* Update element */ AIT_FREE_VAL(&av->cfg_val); AIT_SET_STR(&av->cfg_val, csVal); @@ -255,48 +233,50 @@ cfg_getAttribute(cfg_root_t * __restrict cfg, const ch return AIT_GET_STR(&av->cfg_val); } -#if 0 -// -------------------------------------------------------------- /* - * cfg_LoadAttribute() Extended get attribute, if not found item return *default value* - * @cfg = Head list element + * cfg_loadAttribute() - Get guarded attribute, if not found item return *default value* + * + * @cfg = Config root * @csSec = Config section //[{csSec}], if NULL unset in *default* section - * @csAttr = Config attribute //{csAttr} = ..., if NULL unset as *any* attribute - * @psVal = Return buffer for item Value //... = {psVal} - * @ValLen = Length of buffer //{psVal} for return - * @csDefValue = *Default Value* for return in //{psVal}, if not found item in config list - * return: 0 item not found, -1 error: null parameters; >0 number of copied bytes in //{psVal} -*/ -int cfg_LoadAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr, - u_char * __restrict psVal, int ValLen, const char *csDefValue) + * @csAttr = Config attribute //{csAttr} = ... + * @val = Return buffer for item Value //... = {val} + * @csDefValue = *Default Value* for return in //{val}, if not found item in config + * return: 0 item not found, -1 error or >0 number of copied bytes in //{val} + */ +int +cfg_loadAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr, + ait_val_t * __restrict val, const char *csDefValue) { - struct tagPair *av; + struct tagCfg *av; int ret = 0; - if (!cfg || !csAttr || !ValLen || !psVal) + if (!cfg || !csAttr || !val) { + cfg_SetErr(EINVAL, "Invalid argument(s)"); return -1; + } - av = SelectAttribute(cfg, csSec, csAttr); + av = _selectAttribute(cfg, csSec, csAttr); if (!av) { + /* not found item */ if (csDefValue) { - strlcpy((char*) psVal, csDefValue, ValLen); - ret = strlen((char*) psVal); + AIT_SET_STR(val, csDefValue); + ret = AIT_LEN(val); } - return ret; } - if (!av->psValue || !*av->psValue) { + if (AIT_ISEMPTY(&av->cfg_val) || !*AIT_GET_LIKE(&av->cfg_val, char*)) { + /* empty value */ if (csDefValue) { - strlcpy((char*) psVal, csDefValue, ValLen); - ret = strlen((char*) psVal); + AIT_SET_STR(val, csDefValue); + ret = AIT_LEN(val); } } else { - strlcpy((char*) psVal, (char*) av->psValue, ValLen); - ret = strlen((char*) psVal); + /* copy value */ + AIT_SET_STR(val, AIT_GET_STR(&av->cfg_val)); + ret = AIT_LEN(val); } return ret; } -#endif