summaryrefslogtreecommitdiffstats
path: root/usr.sbin/relayd
diff options
context:
space:
mode:
authorkrw <krw@openbsd.org>2018-07-11 07:39:22 +0000
committerkrw <krw@openbsd.org>2018-07-11 07:39:22 +0000
commita062aa9d6a1c6c36ba1886ff476a56da7d9bd5de (patch)
tree6674982dffd0594a3958b414dbfdadd959c78a5a /usr.sbin/relayd
parentTurn yesterday's optimistic ! in an XXX comment into a more cautious ? (diff)
downloadwireguard-openbsd-a062aa9d6a1c6c36ba1886ff476a56da7d9bd5de.tar.xz
wireguard-openbsd-a062aa9d6a1c6c36ba1886ff476a56da7d9bd5de.zip
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/relayd')
-rw-r--r--usr.sbin/relayd/parse.y8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/relayd/parse.y b/usr.sbin/relayd/parse.y
index 414f2555af3..85b01d266b8 100644
--- a/usr.sbin/relayd/parse.y
+++ b/usr.sbin/relayd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.225 2018/07/09 12:05:11 krw Exp $ */
+/* $OpenBSD: parse.y,v 1.226 2018/07/11 07:39:22 krw Exp $ */
/*
* Copyright (c) 2007 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -2412,7 +2412,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;
}
@@ -2521,7 +2521,7 @@ top:
}
yylval.v.string = strdup(buf);
if (yylval.v.string == NULL)
- err(1, "yylex: strdup");
+ err(1, "%s", __func__);
return (STRING);
}
@@ -2579,7 +2579,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') {