diff options
| author |   krw <krw@openbsd.org> | 2018-07-09 12:05:10 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2018-07-09 12:05:10 +0000 |
| commit | 6a3d55f939083b5d9457342b25519eade91f9c38 (patch) | |
| tree | 188f28c742c46075222046ad71a98373cd17f78e /usr.sbin/httpd | |
| parent | Extend the v4_defroute() function description and make the fallback to (diff) | |
| download | wireguard-openbsd-6a3d55f939083b5d9457342b25519eade91f9c38.tar.xz wireguard-openbsd-6a3d55f939083b5d9457342b25519eade91f9c38.zip | |
No need to mention which memory allocation entry point failed (malloc,
calloc or strdup), we just need to log that we ran out of memory in a
particular function.
Recommended by florian@ and deraadt@
ok benno@ henning@ tb@
Diffstat (limited to 'usr.sbin/httpd')
| -rw-r--r-- | usr.sbin/httpd/parse.y | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/httpd/parse.y b/usr.sbin/httpd/parse.y index 49beb33a350..412b786c254 100644 --- a/usr.sbin/httpd/parse.y +++ b/usr.sbin/httpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.103 2018/06/20 16:43:05 reyk Exp $ */ +/* $OpenBSD: parse.y,v 1.104 2018/07/09 12:05:11 krw Exp $ */ /* * Copyright (c) 2007 - 2015 Reyk Floeter <reyk@openbsd.org> @@ -1606,11 +1606,11 @@ pushfile(const char *name, int secret) struct file *nfile; if ((nfile = calloc(1, sizeof(struct file))) == NULL) { - log_warn("%s: malloc", __func__); + log_warn("%s", __func__); return (NULL); } if ((nfile->name = strdup(name)) == NULL) { - log_warn("%s: malloc", __func__); + log_warn("%s", __func__); free(nfile); return (NULL); } @@ -1630,7 +1630,7 @@ pushfile(const char *name, int secret) nfile->ungetsize = 16; nfile->ungetbuf = malloc(nfile->ungetsize); if (nfile->ungetbuf == NULL) { - log_warn("%s: malloc", __func__); + log_warn("%s", __func__); fclose(nfile->stream); free(nfile->name); free(nfile); |