--- embedtools/src/pceng.c 2011/10/24 20:24:16 1.1.2.11 +++ embedtools/src/pceng.c 2012/04/05 12:22:44 1.1.2.12 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ - * $Id: pceng.c,v 1.1.2.11 2011/10/24 20:24:16 misho Exp $ + * $Id: pceng.c,v 1.1.2.12 2012/04/05 12:22:44 misho Exp $ * ************************************************************************* The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -49,7 +49,7 @@ SUCH DAMAGE. int Verbose, Kill; extern char compiled[], compiledby[], compilehost[]; -sl_config cfg; +cfg_root_t cfg; char szConf[MAXPATHLEN] = DEFAULT_PCENG_CFG; @@ -73,8 +73,8 @@ sigHand(int sig) switch (sig) { case SIGHUP: - UnloadConfig(&cfg); - if (LoadConfig(szConf, &cfg)) { + cfgUnloadConfig(&cfg); + if (cfgLoadConfig(szConf, &cfg)) { syslog(LOG_ERR, "Error:: #%d - %s", cfg_GetErrno(), cfg_GetError()); raise(SIGTERM); } @@ -133,7 +133,7 @@ main(int argc, char **argv) } #endif - if (LoadConfig(szConf, &cfg)) { + if (cfgLoadConfig(szConf, &cfg)) { printf("Error:: #%d - %s\n", cfg_GetErrno(), cfg_GetError()); ret = 1; goto end; @@ -190,7 +190,7 @@ main(int argc, char **argv) ret = Run(); end: - UnloadConfig(&cfg); + cfgUnloadConfig(&cfg); #ifdef __FreeBSD__ if (io > 2) close(io);