ua1zbe
/
aprsc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cfgfile parser: Log errors using hlog

This commit is contained in:
Heikki Hannikainen 2012-10-17 17:52:49 +03:00
parent 81cb9efe10
commit 9481f9e769
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/cfgfile.c
View File

@ -16,6 +16,7 @@
#include "cfgfile.h"
#include "hmalloc.h"
#include "hlog.h"
/* ***************************************************************** */
@ -243,7 +244,7 @@ int cmdparse(struct cfgcmd *cmds, char *cmdline)
if (strncasecmp(cmdp->name, argv[0], strlen(argv[0])) == 0 && strlen(argv[0]) == strlen(cmdp->name))
break;
if (cmdp->function == NULL) {
fprintf(stderr, "No such configuration file directive: %s\n", argv[0]);
hlog(LOG_ERR, "No such configuration file directive: %s", argv[0]);
return -1;
}
return (*cmdp->function)(cmdp->dest, argc, argv);
@ -262,7 +263,7 @@ int read_cfgfile(char *f, struct cfgcmd *cmds)
int ret, n = 0;
if ((fp = fopen(f, "r")) == NULL) {
fprintf(stderr, "Cannot open %s: %s\n", f, strerror(errno));
hlog(LOG_ERR, "Cannot open %s: %s", f, strerror(errno));
return 1;
}
@ -270,7 +271,7 @@ int read_cfgfile(char *f, struct cfgcmd *cmds)
n++;
ret = cmdparse(cmds, line);
if (ret < 0) {
fprintf(stderr, "Problem in %s at line %d: %s\n", f, n, line);
hlog(LOG_ERR, "Problem in %s at line %d: %s", f, n, line);
fclose(fp);
return 2;
}