--- libaitcfg/inc/aitcfg.h 2012/04/03 11:51:52 1.6.4.6 +++ libaitcfg/inc/aitcfg.h 2012/04/03 12:54:49 1.6.4.7 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitcfg.h,v 1.6.4.6 2012/04/03 11:51:52 misho Exp $ +* $Id: aitcfg.h,v 1.6.4.7 2012/04/03 12:54:49 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -122,6 +122,14 @@ int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg * return: -1 error or 0 ok */ int cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, int whitespace); +/* + * cfgMergeConfig() - Marge two list in one cfg and destroy add_cfg + * + * @cfg = Config root of main list + * @add_cfg = Merged config will be destroy after merge + * return: -1 error or 0 ok + */ +int cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t * __restrict add_cfg); #if 0 /* @@ -147,14 +155,6 @@ int CreateConfig(const char *csConfigName, sl_config * * return: 0 ok; -1 error:: can`t concat lists */ int ConcatConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg); - -/* - * 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); #endif /*