version 1.6.4.2, 2012/04/03 09:21:06
|
version 1.6.4.5, 2012/04/04 11:43:05
|
Line 235 cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
|
Line 235 cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
|
} |
} |
|
|
if (!cfg_Write(f, ((whitespace) ? "%s = %s\n" : "%s=%s\n"), |
if (!cfg_Write(f, ((whitespace) ? "%s = %s\n" : "%s=%s\n"), |
AIT_GET_STR(&av->cfg_attr), AIT_GET_STR(&av->cfg_val))) { | AIT_GET_STR(&av->cfg_attr, char*), AIT_GET_STR(&av->cfg_val))) { |
LOGERR; |
LOGERR; |
CFG_RC_UNLOCK(cfg); |
CFG_RC_UNLOCK(cfg); |
return -1; |
return -1; |
Line 255 cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
|
Line 255 cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, i
|
return 0; |
return 0; |
} |
} |
|
|
#if 0 |
|
/* |
/* |
* WriteConfig() Write to file from items in config list | * cfgConcatConfig() - Concat two configs into one |
* @f = file resource | * |
* @cfg = Head list element | * @cfg = Config root |
* return: 0 ok; -1 error:: can`t write to file | * @add_cfg = Concated config will be destroy after merge |
*/ | * return: -1 error or 0 ok |
int WriteConfig(FILE *f, sl_config * __restrict cfg) | */ |
| int |
| cfgConcatConfig(cfg_root_t * __restrict cfg, cfg_root_t * __restrict add_cfg) |
{ |
{ |
return cfgWrite(f, cfg, 1); | struct tagCfg *item; |
} | |
|
|
/* |
|
* cfg_WriteConfig() Write to file from items in config list without whitespaces! |
|
* @f = file resource |
|
* @cfg = Head list element |
|
* return: 0 ok; -1 error:: can`t write to file |
|
*/ |
|
int cfg_WriteConfig(FILE *f, sl_config * __restrict cfg) |
|
{ |
|
return cfgWrite(f, cfg, 0); |
|
} |
|
|
|
/* |
|
* ConcatConfig() Concat two list in one |
|
* @cfg = Head list element of main list |
|
* @add_cfg = Head list element of added list |
|
* return: 0 ok; -1 error:: can`t concat lists |
|
*/ |
|
int ConcatConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg) |
|
{ |
|
struct tagPair *item; |
|
int ret = 0; |
|
|
|
if (!cfg || !add_cfg) |
if (!cfg || !add_cfg) |
return -1; |
return -1; |
|
|
for (item = cfg->slh_first; item->sle_next; item = item->sle_next); | CFG_RC_LOCK(add_cfg); |
item->sle_next = add_cfg->slh_first; | CFG_RC_LOCK(cfg); |
|
|
add_cfg->slh_first = NULL; | /* concat lists */ |
| for (item = SLIST_FIRST(cfg); SLIST_NEXT(item, cfg_next); item = SLIST_NEXT(item, cfg_next)); |
| SLIST_NEXT(item, cfg_next) = SLIST_FIRST(add_cfg); |
|
|
return ret; | /* concat red-black trees */ |
| SLIST_FOREACH(item, add_cfg, cfg_next) |
| RB_INSERT(tagRC, cfg, item); |
| |
| CFG_RC_UNLOCK(cfg); |
| CFG_RC_UNLOCK(add_cfg); |
| |
| add_cfg->slh_first = NULL; |
| add_cfg->rbh_root = NULL; |
| pthread_mutex_destroy(&add_cfg->rc_mtx); |
| return 0; |
} |
} |
|
|
/* |
/* |
* MergeConfig() Marge two list in one cfg and destroy add_cfg | * cfgMergeConfig() - Marge two list in one cfg and destroy add_cfg |
* @cfg = Head list element of main list | * |
* @add_cfg = Head list element of merged list (destroy after all!) | * @cfg = Config root of main list |
* return: 0 ok; -1 error:: can`t merge lists | * @add_cfg = Merged config will be destroy after merge |
*/ | * return: -1 error or 0 ok |
int MergeConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg) | */ |
| int |
| cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t * __restrict add_cfg) |
{ |
{ |
struct tagPair *item, *merge, *add_next, *next = NULL; | struct tagCfg *item, *merge, *add_next, *next = NULL; |
int flg; |
int flg; |
|
|
if (!cfg || !add_cfg) |
if (!cfg || !add_cfg) |
return -1; |
return -1; |
|
|
item = add_cfg->slh_first; | CFG_RC_LOCK(add_cfg); |
while (item) { | CFG_RC_LOCK(cfg); |
add_next = item->sle_next; | SLIST_FOREACH_SAFE(item, add_cfg, cfg_next, add_next) { |
| flg = 0; |
for (flg = 0, merge = cfg->slh_first, next = merge->sle_next; next; | SLIST_FOREACH_SAFE(merge, cfg, cfg_next, next) { |
merge = merge->sle_next, next = merge->sle_next) { | if (AIT_ISEMPTY(&merge->cfg_sec) && AIT_ISEMPTY(&item->cfg_sec)) { |
if (!merge->psSection && !item->psSection) { | SLIST_INSERT_AFTER(merge, item, cfg_next); |
| RB_INSERT(tagRC, cfg, item); |
flg = 1; |
flg = 1; |
merge->sle_next = item; |
|
item->sle_next = next; |
|
break; |
break; |
} |
} |
if (merge->psSection && item->psSection && | if (!AIT_ISEMPTY(&merge->cfg_sec) && !AIT_ISEMPTY(&item->cfg_sec) && |
!strcmp((char*) merge->psSection, (char*) item->psSection)) { | !strcmp(AIT_GET_STR(&merge->cfg_sec), AIT_GET_STR(&item->cfg_sec))) { |
| SLIST_INSERT_AFTER(merge, item, cfg_next); |
| RB_INSERT(tagRC, cfg, item); |
flg = 1; |
flg = 1; |
merge->sle_next = item; |
|
item->sle_next = next; |
|
break; |
break; |
} |
} |
} |
} |
|
|
if (!flg) { |
if (!flg) { |
if (!merge->sle_next) { | SLIST_INSERT_AFTER(merge, item, cfg_next); |
merge->sle_next = item; | RB_INSERT(tagRC, cfg, item); |
item->sle_next = NULL; | |
} else | |
return -1; | |
} |
} |
|
|
item = add_next; |
|
} |
} |
|
CFG_RC_UNLOCK(cfg); |
|
CFG_RC_UNLOCK(add_cfg); |
|
|
add_cfg->slh_first = NULL; |
add_cfg->slh_first = NULL; |
| add_cfg->rbh_root = NULL; |
| pthread_mutex_destroy(&add_cfg->rc_mtx); |
return 0; |
return 0; |
} |
} |
#endif |
|