diff options
| author |   Jeremie Corbier <jeremie.corbier@resel.enst-bretagne.fr> | 2010-03-25 10:07:03 +0100 |
|---|---|---|
| committer |   Bjørn Mork <bjorn@mork.no> | 2010-08-06 15:37:37 +0200 |
| commit | aeedae61d12778c4428a7e266913221269480162 (patch) | |
| tree | 023ce3b78a8d62a129032fc6028d457f5e9199c1 /cftoken.l | |
| parent | 2fa86d0c611b69e175c3b07116e9b67b85fe20ef (diff) | |
102_libc6-2.9-fixes.diff from the Debian package version 20080615-8:
"Fixes for recent libc releases."
[ignoring changes to the build generated cftoken.c file]
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Diffstat (limited to 'cftoken.l')
| -rw-r--r-- | cftoken.l | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -340,10 +340,10 @@ cfdebug_print(w, t, l) int l; { if (w) { - dprintf(LOG_DEBUG, FNAME, + debug_printf(LOG_DEBUG, FNAME, "<%d>%s [%s] (%d)", yy_start, w, t, l); } else { - dprintf(LOG_DEBUG, FNAME, + debug_printf(LOG_DEBUG, FNAME, "<%d>[%s] (%d)", yy_start, t, l); } } @@ -359,7 +359,7 @@ yyerror0(int level, char *s, va_list ap) if (bp < ep) bp += vsnprintf(bp, ep - bp, s, ap); - dprintf(level, FNAME, ebuf); + debug_printf(level, FNAME, ebuf); } void @@ -397,7 +397,7 @@ cfswitch_buffer(incl) FILE *fp; if (incstackp >= MAX_INCLUDE_DEPTH) { - dprintf(LOG_ERR, FNAME, "cfparse: includes nested too deeply"); + debug_printf(LOG_ERR, FNAME, "cfparse: includes nested too deeply"); return (-1); } incstack[incstackp].path = configfilename; @@ -406,7 +406,7 @@ cfswitch_buffer(incl) fp = fopen(path, "r"); if (fp == NULL) { - dprintf(LOG_ERR, FNAME, "cfparse: fopen(%s): %s", + debug_printf(LOG_ERR, FNAME, "cfparse: fopen(%s): %s", path, strerror(errno)); if (errno == ENOENT) return (0); @@ -428,7 +428,7 @@ cfparse(conf) { configfilename = conf; if ((yyin = fopen(configfilename, "r")) == NULL) { - dprintf(LOG_ERR, FNAME, "cfparse: fopen(%s): %s", + debug_printf(LOG_ERR, FNAME, "cfparse: fopen(%s): %s", configfilename, strerror(errno)); if (errno == ENOENT) return (0); |