version 1.6.4.3, 2012/04/03 12:54:49
|
version 1.6.4.4, 2012/04/03 13:47:23
|
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 |
|
/* |
/* |
* ConcatConfig() Concat two list in one | * cfgConcatConfig() - Concat two configs into one |
* @cfg = Head list element of main list | * |
* @add_cfg = Head list element of added list | * @cfg = Config root |
* return: 0 ok; -1 error:: can`t concat lists | * @add_cfg = Concated config will be destroy after merge |
*/ | * return: -1 error or 0 ok |
int ConcatConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg) | */ |
| int |
| cfgConcatConfig(cfg_root_t * __restrict cfg, cfg_root_t * __restrict add_cfg) |
{ |
{ |
struct tagPair *item; | struct tagCfg *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; |
} |
} |
#endif |
|
|
|
/* |
/* |
* cfgMergeConfig() - Marge two list in one cfg and destroy add_cfg |
* cfgMergeConfig() - Marge two list in one cfg and destroy add_cfg |