diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2018-07-11 07:39:23 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2018-07-11 07:39:23 +0000 |
| commit | e9159a03ef2d9f0f3a9873c392d95a908b841569 (patch) | |
| tree | 39796b33181ab19f497e5cc9fff9c0d4957ce007 /usr.sbin/ospf6d/parse.y | |
| parent | 1be8c8620ab902fc53c6582bca1e1127ad67409a (diff) | |
Do for most running out of memory err() what was done for most running
out of memory log_warn(). i.e. ("%s", __func__) instead of manual
function names and redundant verbiage about which wrapper detected the
out of memory condition.
ok henning@
Diffstat (limited to 'usr.sbin/ospf6d/parse.y')
| -rw-r--r-- | usr.sbin/ospf6d/parse.y | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/ospf6d/parse.y b/usr.sbin/ospf6d/parse.y index 833bb72cc0b..32b1492a63f 100644 --- a/usr.sbin/ospf6d/parse.y +++ b/usr.sbin/ospf6d/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.34 2018/07/09 12:05:11 krw Exp $ */ +/* $OpenBSD: parse.y,v 1.35 2018/07/11 07:39:22 krw Exp $ */ /* * Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org> @@ -677,7 +677,7 @@ lungetc(int c) if (file->ungetpos >= file->ungetsize) { void *p = reallocarray(file->ungetbuf, file->ungetsize, 2); if (p == NULL) - err(1, "lungetc"); + err(1, "%s", __func__); file->ungetbuf = p; file->ungetsize *= 2; } @@ -786,7 +786,7 @@ top: } yylval.v.string = strdup(buf); if (yylval.v.string == NULL) - err(1, "yylex: strdup"); + err(1, "%s", __func__); return (STRING); } @@ -844,7 +844,7 @@ nodigits: *p = '\0'; if ((token = lookup(buf)) == STRING) if ((yylval.v.string = strdup(buf)) == NULL) - err(1, "yylex: strdup"); + err(1, "%s", __func__); return (token); } if (c == '\n') { @@ -1171,7 +1171,7 @@ prefix(const char *s, struct in6_addr *addr, u_int8_t *plen) errx(1, "invalid netmask: %s", errstr); if ((ps = malloc(strlen(s) - strlen(p) + 1)) == NULL) - err(1, "parse_prefix: malloc"); + err(1, "%s", __func__); strlcpy(ps, s, strlen(s) - strlen(p) + 1); if (host(ps, addr) == 0) { |