diff options
| -rw-r--r-- | usr.sbin/ospf6d/log.c | 4 | ||||
| -rw-r--r-- | usr.sbin/ospf6d/log.h | 3 | ||||
| -rw-r--r-- | usr.sbin/ospf6d/parse.y | 12 | ||||
| -rw-r--r-- | usr.sbin/ospfd/log.c | 4 | ||||
| -rw-r--r-- | usr.sbin/ospfd/log.h | 3 | ||||
| -rw-r--r-- | usr.sbin/ospfd/parse.y | 12 |
6 files changed, 18 insertions, 20 deletions
diff --git a/usr.sbin/ospf6d/log.c b/usr.sbin/ospf6d/log.c index 34d1efca6ca..1bbf505074f 100644 --- a/usr.sbin/ospf6d/log.c +++ b/usr.sbin/ospf6d/log.c @@ -1,4 +1,4 @@ -/* $OpenBSD: log.c,v 1.10 2012/10/22 07:28:49 bluhm Exp $ */ +/* $OpenBSD: log.c,v 1.11 2014/11/03 07:40:31 bluhm Exp $ */ /* * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org> @@ -43,8 +43,6 @@ static const char * const procnames[] = { int debug; int verbose; -void logit(int, const char *, ...); - void log_init(int n_debug) { diff --git a/usr.sbin/ospf6d/log.h b/usr.sbin/ospf6d/log.h index 09d6b5754c1..0cc74030235 100644 --- a/usr.sbin/ospf6d/log.h +++ b/usr.sbin/ospf6d/log.h @@ -1,4 +1,4 @@ -/* $OpenBSD: log.h,v 1.7 2012/09/20 07:22:48 bluhm Exp $ */ +/* $OpenBSD: log.h,v 1.8 2014/11/03 07:40:31 bluhm Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -23,6 +23,7 @@ void log_init(int); void log_verbose(int); +void logit(int, const char *, ...); void vlog(int, const char *, va_list); void log_warn(const char *, ...); void log_warnx(const char *, ...); diff --git a/usr.sbin/ospf6d/parse.y b/usr.sbin/ospf6d/parse.y index caccede74a8..d2e39ad7b63 100644 --- a/usr.sbin/ospf6d/parse.y +++ b/usr.sbin/ospf6d/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.25 2014/11/02 00:22:00 doug Exp $ */ +/* $OpenBSD: parse.y,v 1.26 2014/11/03 07:40:31 bluhm Exp $ */ /* * Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org> @@ -522,15 +522,15 @@ int yyerror(const char *fmt, ...) { va_list ap; - char *nfmt; + char *msg; file->errors++; va_start(ap, fmt); - if (asprintf(&nfmt, "%s:%d: %s", file->name, yylval.lineno, fmt) == -1) - fatalx("yyerror asprintf"); - vlog(LOG_CRIT, nfmt, ap); + if (vasprintf(&msg, fmt, ap) == -1) + fatalx("yyerror vasprintf"); va_end(ap); - free(nfmt); + logit(LOG_CRIT, "%s:%d: %s", file->name, yylval.lineno, msg); + free(msg); return (0); } diff --git a/usr.sbin/ospfd/log.c b/usr.sbin/ospfd/log.c index c75448e98c5..8fe81b24af1 100644 --- a/usr.sbin/ospfd/log.c +++ b/usr.sbin/ospfd/log.c @@ -1,4 +1,4 @@ -/* $OpenBSD: log.c,v 1.7 2011/08/20 11:16:09 sthen Exp $ */ +/* $OpenBSD: log.c,v 1.8 2014/11/03 07:40:31 bluhm Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -36,8 +36,6 @@ static const char * const procnames[] = { int debug; int verbose; -void logit(int, const char *, ...); - void log_init(int n_debug) { diff --git a/usr.sbin/ospfd/log.h b/usr.sbin/ospfd/log.h index ff5ef25a428..e0034e80324 100644 --- a/usr.sbin/ospfd/log.h +++ b/usr.sbin/ospfd/log.h @@ -1,4 +1,4 @@ -/* $OpenBSD: log.h,v 1.5 2009/11/02 20:20:54 claudio Exp $ */ +/* $OpenBSD: log.h,v 1.6 2014/11/03 07:40:31 bluhm Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -23,6 +23,7 @@ void log_init(int); void log_verbose(int); +void logit(int, const char *, ...); void vlog(int, const char *, va_list); void log_warn(const char *, ...); void log_warnx(const char *, ...); diff --git a/usr.sbin/ospfd/parse.y b/usr.sbin/ospfd/parse.y index b95b4670254..b2bddfed364 100644 --- a/usr.sbin/ospfd/parse.y +++ b/usr.sbin/ospfd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.77 2014/11/02 00:22:00 doug Exp $ */ +/* $OpenBSD: parse.y,v 1.78 2014/11/03 07:40:31 bluhm Exp $ */ /* * Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org> @@ -698,15 +698,15 @@ int yyerror(const char *fmt, ...) { va_list ap; - char *nfmt; + char *msg; file->errors++; va_start(ap, fmt); - if (asprintf(&nfmt, "%s:%d: %s", file->name, yylval.lineno, fmt) == -1) - fatalx("yyerror asprintf"); - vlog(LOG_CRIT, nfmt, ap); + if (vasprintf(&msg, fmt, ap) == -1) + fatalx("yyerror vasprintf"); va_end(ap); - free(nfmt); + logit(LOG_CRIT, "%s:%d: %s", file->name, yylval.lineno, msg); + free(msg); return (0); } |