--- libaitcfg/inc/aitcfg.h 2012/04/03 12:54:49 1.6.4.7 +++ libaitcfg/inc/aitcfg.h 2012/04/03 13:47:23 1.6.4.8 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitcfg.h,v 1.6.4.7 2012/04/03 12:54:49 misho Exp $ +* $Id: aitcfg.h,v 1.6.4.8 2012/04/03 13:47:23 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -123,6 +123,14 @@ int cfgReadConfig(FILE *f, cfg_root_t * __restrict cfg */ int cfgWriteConfig(FILE *f, cfg_root_t * __restrict cfg, int whitespace); /* + * cfgConcatConfig() - Concat two configs into one + * + * @cfg = Config root + * @add_cfg = Concated config will be destroy after merge + * return: -1 error or 0 ok + */ +int cfgConcatConfig(cfg_root_t * __restrict cfg, cfg_root_t * __restrict add_cfg); +/* * cfgMergeConfig() - Marge two list in one cfg and destroy add_cfg * * @cfg = Config root of main list @@ -146,15 +154,6 @@ int cfg_CreateConfig(const char *csConfigName, sl_conf * return: 0 ok; -1 error:: can`t save new config */ int CreateConfig(const char *csConfigName, sl_config * __restrict cfg); - - -/* - * 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); #endif /*