--- libaitcfg/src/queue.c 2011/05/10 20:52:36 1.6.2.1 +++ libaitcfg/src/queue.c 2012/04/02 14:39:03 1.6.4.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: queue.c,v 1.6.2.1 2011/05/10 20:52:36 misho Exp $ +* $Id: queue.c,v 1.6.4.1 2012/04/02 14:39:03 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, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -44,93 +44,90 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF TH SUCH DAMAGE. */ #include "global.h" -#include "aitcfg.h" -/* - * SelectAttribute() Select item //{tagPair} from config list with attribute parameter(s) - * @cfg = Head list element - * @csSec = Config section //[{csSec}], if NULL search in *default* section - * @csAttr = Config attribute //{csAttr} = ..., if NULL search in *any* attribute - * return: NULL not found attribute; //{tagPair} selected first seen attribute item from list -*/ -static inline struct tagPair * -SelectAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr) +static inline struct tagCfg * +_selectAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr) { - struct tagPair *av; + struct tagCfg fav; + struct tagCfg *av; if (!cfg) return NULL; + else + memset(&fav, 0, sizeof fav); - for (av = cfg->slh_first; av; av = av->sle_next) { - if ((!csSec || !*csSec) && !av->psSection) { - if (!csAttr) - return av; - if (!strcmp((char*) av->psAttribute, (char*) csAttr)) - return av; - } - if (csSec && av->psSection && !strcmp((char*) av->psSection, (char*) csSec)) { - if (!csAttr) - return av; - if (!strcmp((char*) av->psAttribute, (char*) csAttr)) - return av; - } + if (csSec && *csSec) + AIT_KEY(&fav.cfg_sec) = crcFletcher16((u_short*) csSec, + io_align(strlen(csSec), 1) / 2); + if (csAttr) + AIT_KEY(&fav.cfg_attr) = crcFletcher16((u_short*) csAttr, + io_align(strlen(csAttr), 1) / 2); + + /* + 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)); } - return NULL; + 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 + return RB_FIND(tagRC, cfg, &fav); } -/* - * DestroyAttribute() Free //{tagPair} item elements memory and destroy resource - * @pair = Free this element -*/ static inline void -DestroyAttribute(struct tagPair *pair) +_destroyAttribute(struct tagCfg *av) { - if (!pair) + if (!av) return; - if (pair->psValue) - free(pair->psValue); - if (pair->psAttribute) - free(pair->psAttribute); - if (pair->psSection) - free(pair->psSection); - - free(pair); + 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 list - * @cfg = Head list element + * cfg_findAttribute() - Find attribute position in config file + * + * @cfg = Config root * @csSec = Config section //[{csSec}] * @csAttr = Config attribute //{csAttr} = ... * return: 0 not found item; -1 error: null parameters; >0 position in list -*/ + */ inline int -cfg_FindAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr) +cfg_findAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr) { - struct tagPair *av; + struct tagCfg *av, fav; register int cx = 0; - if (!cfg || !csAttr) + if (!cfg || !csAttr) { + cfg_SetErr(EINVAL, "Invalid argument(s)"); return -1; + } else + memset(&fav, 0, sizeof fav); - for (av = cfg->slh_first; av; av = av->sle_next) { + if (csSec && *csSec) + AIT_KEY(&fav.cfg_sec) = crcFletcher16((u_short*) csSec, + io_align(strlen(csSec), 1) / 2); + if (csAttr) + AIT_KEY(&fav.cfg_attr) = crcFletcher16((u_short*) csAttr, + io_align(strlen(csAttr), 1) / 2); + + SLIST_FOREACH(av, cfg, cfg_next) { ++cx; - if ((!csSec || !*csSec) && !av->psSection) - if (!strcmp((char*) av->psAttribute, (char*) csAttr)) - return cx; - if (csSec && av->psSection && !strcmp((char*) av->psSection, (char*) csSec)) - if (!strcmp((char*) av->psAttribute, (char*) csAttr)) - return cx; + if (!cfg_tree_cmp(&fav, av)) + return cx; } return 0; } - +#if 0 /* * cfg_UnsetAttribute() Unset item from config list and free resources * @cfg = Head list element @@ -138,8 +135,7 @@ cfg_FindAttribute(sl_config * __restrict cfg, const u_ * @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) +int cfg_UnsetAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr) { struct tagPair *av, *curr; register int cx = 0; @@ -179,8 +175,7 @@ cfg_UnsetAttribute(sl_config * __restrict cfg, const u * @csVal = Config value //... = {csVal} to setup * return: 0 nothing changed, -1 error: not enough memory; 1 find and update item; 2 added new item */ -int -cfg_SetAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr, const u_char *csVal) +int cfg_SetAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr, const u_char *csVal) { struct tagPair *av, *section; int len; @@ -269,39 +264,31 @@ cfg_SetAttribute(sl_config * __restrict cfg, const u_c return 0; } +#endif + /* - * cfg_GetAttribute() Get item from config list and return his value - * @cfg = Head list element + * cfg_getAttribute() - Get item from config and return value from it + * + * @cfg = Config root * @csSec = Config section //[{csSec}], if NULL unset in *default* section * @csAttr = Config attribute //{csAttr} = ..., if NULL unset as *any* attribute * return: NULL item not found or null parameters; !=NULL value const string -*/ -inline const u_char * -cfg_GetAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr) + */ +inline const char * +cfg_getAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr) { - struct tagPair *av; + struct tagCfg *av; if (!cfg || !csAttr) return NULL; - av = SelectAttribute(cfg, csSec, csAttr); + av = _selectAttribute(cfg, csSec, csAttr); if (!av) return NULL; - return av->psValue; + return AIT_GET_STR(&av->cfg_val); } - -/* - * cfg_FirstItem() Get first item from config list and return his value - * @cfg = Head list element - * return: NULL if no items in list; !=NULL first pair item -*/ -inline struct tagPair * -cfg_FirstItem(sl_config * __restrict cfg) -{ - return cfg->slh_first; -} - +#if 0 // -------------------------------------------------------------- /* @@ -314,8 +301,7 @@ cfg_FirstItem(sl_config * __restrict cfg) * @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, +int cfg_LoadAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr, u_char * __restrict psVal, int ValLen, const char *csDefValue) { struct tagPair *av; @@ -346,3 +332,4 @@ cfg_LoadAttribute(sl_config * __restrict cfg, const u_ return ret; } +#endif