version 1.2.2.3, 2009/09/23 14:20:53
|
version 1.2.2.4, 2009/10/19 14:58:24
|
Line 255 int ConcatConfig(sl_config * __restrict cfg, sl_config
|
Line 255 int ConcatConfig(sl_config * __restrict cfg, sl_config
|
for (item = cfg->slh_first; item->sle_next; item = item->sle_next); |
for (item = cfg->slh_first; item->sle_next; item = item->sle_next); |
item->sle_next = add_cfg->slh_first; |
item->sle_next = add_cfg->slh_first; |
|
|
|
add_cfg->slh_first = NULL; |
|
|
return ret; |
return ret; |
} |
} |
|
|
|
/* |
|
* MergeConfig() 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!) |
|
* return: 0 ok; -1 error:: can`t merge lists |
|
*/ |
|
int MergeConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg) |
|
{ |
|
struct tagPair *item, *merge, *add_next, *next = NULL; |
|
int flg; |
|
|
|
if (!cfg || !add_cfg) |
|
return -1; |
|
|
|
item = add_cfg->slh_first; |
|
while (item) { |
|
add_next = item->sle_next; |
|
|
|
for (flg = 0, merge = cfg->slh_first, next = merge->sle_next; next; |
|
merge = merge->sle_next, next = merge->sle_next) { |
|
if (!merge->psSection && !item->psSection) { |
|
flg = 1; |
|
merge->sle_next = item; |
|
item->sle_next = next; |
|
break; |
|
} |
|
if (merge->psSection && item->psSection && |
|
!strcmp((char*) merge->psSection, (char*) item->psSection)) { |
|
flg = 1; |
|
merge->sle_next = item; |
|
item->sle_next = next; |
|
break; |
|
} |
|
} |
|
|
|
if (!flg) { |
|
if (!merge->sle_next) { |
|
merge->sle_next = item; |
|
item->sle_next = NULL; |
|
} else |
|
return -1; |
|
} |
|
|
|
item = add_next; |
|
} |
|
|
|
add_cfg->slh_first = NULL; |
|
|
|
return 0; |
|
} |