version 1.6.4.3, 2012/04/02 15:39:55
|
version 1.6.4.6, 2012/04/03 07:31:06
|
Line 63 _selectAttribute(cfg_root_t * __restrict cfg, const ch
|
Line 63 _selectAttribute(cfg_root_t * __restrict cfg, const ch
|
AIT_KEY(&fav.cfg_attr) = crcFletcher16((u_short*) csAttr, |
AIT_KEY(&fav.cfg_attr) = crcFletcher16((u_short*) csAttr, |
io_align(strlen(csAttr), 1) / 2); |
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) |
if (!csAttr) |
return RB_NFIND(tagRC, cfg, &fav); |
return RB_NFIND(tagRC, cfg, &fav); |
else |
else |
return RB_FIND(tagRC, cfg, &fav); |
return RB_FIND(tagRC, cfg, &fav); |
} |
} |
|
|
static inline void | /* --------------------------------------------------------------- */ |
_destroyAttribute(struct tagCfg *av) | |
{ | |
if (!av) | |
return; | |
|
|
} |
|
|
|
// ---------------------------------------------- |
|
|
|
/* |
/* |
* cfg_findAttribute() - Find attribute position in config file |
* cfg_findAttribute() - Find attribute position in config file |
* |
* |
Line 171 cfg_setAttribute(cfg_root_t * __restrict cfg, const ch
|
Line 153 cfg_setAttribute(cfg_root_t * __restrict cfg, const ch
|
{ |
{ |
struct tagCfg *av, *section; |
struct tagCfg *av, *section; |
|
|
if (!cfg || !csAttr || !csVal) | if (!cfg || !csAttr) |
return -1; |
return -1; |
|
|
av = _selectAttribute(cfg, csSec, csAttr); |
av = _selectAttribute(cfg, csSec, csAttr); |
Line 199 cfg_setAttribute(cfg_root_t * __restrict cfg, const ch
|
Line 181 cfg_setAttribute(cfg_root_t * __restrict cfg, const ch
|
AIT_KEY(&av->cfg_sec) = crcFletcher16(AIT_GET_LIKE(&av->cfg_sec, u_short*), |
AIT_KEY(&av->cfg_sec) = crcFletcher16(AIT_GET_LIKE(&av->cfg_sec, u_short*), |
io_align(AIT_LEN(&av->cfg_sec) - 1, 1) / 2); |
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_SET_STR(&av->cfg_attr, csAttr); |
AIT_KEY(&av->cfg_attr) = crcFletcher16(AIT_GET_LIKE(&av->cfg_attr, u_short*), |
AIT_KEY(&av->cfg_attr) = crcFletcher16(AIT_GET_LIKE(&av->cfg_attr, u_short*), |
io_align(AIT_LEN(&av->cfg_attr) - 1, 1) / 2); |
io_align(AIT_LEN(&av->cfg_attr) - 1, 1) / 2); |
Line 210 cfg_setAttribute(cfg_root_t * __restrict cfg, const ch
|
Line 192 cfg_setAttribute(cfg_root_t * __restrict cfg, const ch
|
return 2; |
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 */ |
/* Update element */ |
AIT_FREE_VAL(&av->cfg_val); |
AIT_FREE_VAL(&av->cfg_val); |
AIT_SET_STR(&av->cfg_val, csVal); |
AIT_SET_STR(&av->cfg_val, csVal); |
Line 243 cfg_getAttribute(cfg_root_t * __restrict cfg, const ch
|
Line 225 cfg_getAttribute(cfg_root_t * __restrict cfg, const ch
|
|
|
return AIT_GET_STR(&av->cfg_val); |
return AIT_GET_STR(&av->cfg_val); |
} |
} |
#if 0 |
|
// -------------------------------------------------------------- |
|
|
|
/* |
/* |
* cfg_LoadAttribute() Extended get attribute, if not found item return *default value* | * cfg_loadAttribute() - Get guarded attribute, if not found item return *default value* |
* @cfg = Head list element | * |
| * @cfg = Config root |
* @csSec = Config section //[{csSec}], if NULL unset in *default* section |
* @csSec = Config section //[{csSec}], if NULL unset in *default* section |
* @csAttr = Config attribute //{csAttr} = ..., if NULL unset as *any* attribute | * @csAttr = Config attribute //{csAttr} = ... |
* @psVal = Return buffer for item Value //... = {psVal} | * @val = Return buffer for item Value //... = {val} |
* @ValLen = Length of buffer //{psVal} for return | * @csDefValue = *Default Value* for return in //{val}, if not found item in config |
* @csDefValue = *Default Value* for return in //{psVal}, if not found item in config list | * return: 0 item not found, -1 error or >0 number of copied bytes in //{val} |
* return: 0 item not found, -1 error: null parameters; >0 number of copied bytes in //{psVal} | */ |
*/ | int |
int cfg_LoadAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr, | cfg_loadAttribute(cfg_root_t * __restrict cfg, const char *csSec, const char *csAttr, |
u_char * __restrict psVal, int ValLen, const char *csDefValue) | ait_val_t * __restrict val, const char *csDefValue) |
{ |
{ |
struct tagPair *av; | struct tagCfg *av; |
int ret = 0; |
int ret = 0; |
|
|
if (!cfg || !csAttr || !ValLen || !psVal) | if (!cfg || !csAttr || !val) { |
| cfg_SetErr(EINVAL, "Invalid argument(s)"); |
return -1; |
return -1; |
|
} |
|
|
av = SelectAttribute(cfg, csSec, csAttr); | av = _selectAttribute(cfg, csSec, csAttr); |
if (!av) { |
if (!av) { |
|
/* not found item */ |
if (csDefValue) { |
if (csDefValue) { |
strlcpy((char*) psVal, csDefValue, ValLen); | AIT_SET_STR(val, csDefValue); |
ret = strlen((char*) psVal); | ret = AIT_LEN(val); |
} |
} |
|
|
return ret; |
return ret; |
} |
} |
|
|
if (!av->psValue || !*av->psValue) { | if (AIT_ISEMPTY(&av->cfg_val) || !*AIT_GET_LIKE(&av->cfg_val, char*)) { |
| /* empty value */ |
if (csDefValue) { |
if (csDefValue) { |
strlcpy((char*) psVal, csDefValue, ValLen); | AIT_SET_STR(val, csDefValue); |
ret = strlen((char*) psVal); | ret = AIT_LEN(val); |
} |
} |
} else { |
} else { |
strlcpy((char*) psVal, (char*) av->psValue, ValLen); | /* copy value */ |
ret = strlen((char*) psVal); | AIT_SET_STR(val, AIT_GET_STR(&av->cfg_val)); |
| ret = AIT_LEN(val); |
} |
} |
|
|
return ret; |
return ret; |
} |
} |
#endif |
|