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@

diff --git a/sbin/iked/parse.y b/sbin/iked/parse.y
index 25c08cd..85f88df 100644 (file)
--- a/sbin/iked/parse.y
+++ b/sbin/iked/parse.y
@@ -1,4 +1,4 @@
-/*     $OpenBSD: parse.y,v 1.73 2018/07/08 17:15:07 krw Exp $  */
+/*     $OpenBSD: parse.y,v 1.74 2018/07/09 12:05:10 krw Exp $  */
 
 /*
  * Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org>
@@ -1503,11 +1503,11 @@ pushfile(const char *name, int secret)
        struct file     *nfile;
 
        if ((nfile = calloc(1, sizeof(struct file))) == NULL) {
-               warn("calloc");
+               warn("%s", __func__);
                return (NULL);
        }
        if ((nfile->name = strdup(name)) == NULL) {
-               warn("strdup");
+               warn("%s", __func__);
                free(nfile);
                return (NULL);
        }
@@ -1515,12 +1515,12 @@ pushfile(const char *name, int secret)
                nfile->stream = stdin;
                free(nfile->name);
                if ((nfile->name = strdup("stdin")) == NULL) {
-                       warn("strdup");
+                       warn("%s", __func__);
                        free(nfile);
                        return (NULL);
                }
        } else if ((nfile->stream = fopen(nfile->name, "r")) == NULL) {
-               warn("%s", nfile->name);
+               warn("%s: %s", __func__, nfile->name);
                free(nfile->name);
                free(nfile);
                return (NULL);
@@ -1535,7 +1535,7 @@ pushfile(const char *name, int secret)
        nfile->ungetsize = 16;
        nfile->ungetbuf = malloc(nfile->ungetsize);
        if (nfile->ungetbuf == NULL) {
-               warn("malloc");
+               warn("%s", __func__);
                fclose(nfile->stream);
                free(nfile->name);
                free(nfile);

diff --git a/sbin/ipsecctl/parse.y b/sbin/ipsecctl/parse.y
index e022bf5..5c71732 100644 (file)
--- a/sbin/ipsecctl/parse.y
+++ b/sbin/ipsecctl/parse.y
@@ -1,4 +1,4 @@
-/*     $OpenBSD: parse.y,v 1.171 2018/07/08 17:15:07 krw Exp $ */
+/*     $OpenBSD: parse.y,v 1.172 2018/07/09 12:05:10 krw Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -1300,11 +1300,11 @@ pushfile(const char *name, int secret)
        struct file     *nfile;
 
        if ((nfile = calloc(1, sizeof(struct file))) == NULL) {
-               warn("calloc");
+               warn("%s", __func__);
                return (NULL);
        }
        if ((nfile->name = strdup(name)) == NULL) {
-               warn("strdup");
+               warn("%s", __func__);
                free(nfile);
                return (NULL);
        }
@@ -1312,12 +1312,12 @@ pushfile(const char *name, int secret)
                nfile->stream = stdin;
                free(nfile->name);
                if ((nfile->name = strdup("stdin")) == NULL) {
-                       warn("strdup");
+                       warn("%s", __func__);
                        free(nfile);
                        return (NULL);
                }
        } else if ((nfile->stream = fopen(nfile->name, "r")) == NULL) {
-               warn("%s", nfile->name);
+               warn("%s: %s", __func__, nfile->name);
                free(nfile->name);
                free(nfile);
                return (NULL);

diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y
index 98e4854..bccb77f 100644 (file)
--- a/sbin/pfctl/parse.y
+++ b/sbin/pfctl/parse.y
@@ -1,4 +1,4 @@
-/*     $OpenBSD: parse.y,v 1.674 2018/07/08 17:15:07 krw Exp $ */
+/*     $OpenBSD: parse.y,v 1.675 2018/07/09 12:05:10 krw Exp $ */
 
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -5549,23 +5549,21 @@ pushfile(const char *name, int secret)
 
        if ((nfile = calloc(1, sizeof(struct file))) == NULL ||
            (nfile->name = strdup(name)) == NULL) {
-               if (nfile) {
-                       warn("strdup");
+               warn("%s", __func__);
+               if (nfile)
                        free(nfile);
-               } else
-                       warn("calloc");
                return (NULL);
        }
        if (TAILQ_FIRST(&files) == NULL && strcmp(nfile->name, "-") == 0) {
                nfile->stream = stdin;
                free(nfile->name);
                if ((nfile->name = strdup("stdin")) == NULL) {
-                       warn("strdup");
+                       warn("%s", __func__);
                        free(nfile);
                        return (NULL);
                }
        } else if ((nfile->stream = fopen(nfile->name, "r")) == NULL) {
-               warn("%s", nfile->name);
+               warn("%s: %s", __func__, nfile->name);
                free(nfile->name);
                free(nfile);
                return (NULL);
@@ -5580,7 +5578,7 @@ pushfile(const char *name, int secret)
        nfile->ungetsize = 16;
        nfile->ungetbuf = malloc(nfile->ungetsize);
        if (nfile->ungetbuf == NULL) {
-               warn("malloc");
+               warn("%s", __func__);
                fclose(nfile->stream);
                free(nfile->name);
                free(nfile);

diff --git a/usr.sbin/acme-client/parse.y b/usr.sbin/acme-client/parse.y
index d5666bd..207d393 100644 (file)
--- a/usr.sbin/acme-client/parse.y
+++ b/usr.sbin/acme-client/parse.y
@@ -1,4 +1,4 @@
-/*     $OpenBSD: parse.y,v 1.23 2018/07/08 17:15:07 krw Exp $ */
+/*     $OpenBSD: parse.y,v 1.24 2018/07/09 12:05:11 krw Exp $ */
 
 /*
  * Copyright (c) 2016 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -703,16 +703,16 @@ pushfile(const char *name)
        struct file     *nfile;
 
        if ((nfile = calloc(1, sizeof(struct file))) == NULL) {
-               warn("calloc");
+               warn("%s", __func__);
                return (NULL);
        }
        if ((nfile->name = strdup(name)) == NULL) {
-               warn("strdup");
+               warn("%s", __func__);
                free(nfile);
                return (NULL);
        }
        if ((nfile->stream = fopen(nfile->name, "r")) == NULL) {
-               warn("%s", nfile->name);
+               warn("%s: %s", __func__, nfile->name);
                free(nfile->name);
                free(nfile);
                return (NULL);
@@ -721,7 +721,7 @@ pushfile(const char *name)
        nfile->ungetsize = 16;
        nfile->ungetbuf = malloc(nfile->ungetsize);
        if (nfile->ungetbuf == NULL) {
-               warn("malloc");
+               warn("%s", __func__);
                fclose(nfile->stream);
                free(nfile->name);
                free(nfile);

diff --git a/usr.sbin/bgpd/parse.y b/usr.sbin/bgpd/parse.y
index 7377123..9759c2b 100644 (file)
--- a/usr.sbin/bgpd/parse.y
+++ b/usr.sbin/bgpd/parse.y
@@ -1,4 +1,4 @@
-/*     $OpenBSD: parse.y,v 1.324 2018/07/08 17:15:07 krw Exp $ */
+/*     $OpenBSD: parse.y,v 1.325 2018/07/09 12:05:11 krw Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -2894,16 +2894,16 @@ pushfile(const char *name, int secret)
        struct file     *nfile;
 
        if ((nfile = calloc(1, sizeof(struct file))) == NULL) {
-               log_warn("calloc");
+               log_warn("%s", __func__);
                return (NULL);
        }
        if ((nfile->name = strdup(name)) == NULL) {
-               log_warn("strdup");
+               log_warn("%s", __func__);
                free(nfile);
                return (NULL);
        }
        if ((nfile->stream = fopen(nfile->name, "r")) == NULL) {
-               log_warn("%s", nfile->name);
+               log_warn("%s: %s", __func__, nfile->name);
                free(nfile->name);
                free(nfile);
                return (NULL);
@@ -2919,7 +2919,7 @@ pushfile(const char *name, int secret)
        nfile->ungetsize = 16;
        nfile->ungetbuf = malloc(nfile->ungetsize);
        if (nfile->ungetbuf == NULL) {
-               log_warn("malloc");
+               log_warn("%s", __func__);
                fclose(nfile->stream);
                free(nfile->name);
                free(nfile);

diff --git a/usr.sbin/dvmrpd/parse.y b/usr.sbin/dvmrpd/parse.y
index d0fd56e..4ce5fc1 100644 (file)
--- a/usr.sbin/dvmrpd/parse.y
+++ b/usr.sbin/dvmrpd/parse.y
@@ -1,4 +1,4 @@
-/*     $OpenBSD: parse.y,v 1.34 2018/07/08 17:15:07 krw Exp $ */
+/*     $OpenBSD: parse.y,v 1.35 2018/07/09 12:05:11 krw Exp $ */
 
 /*
  * Copyright (c) 2004, 2005, 2006 Esben Norby <norby@openbsd.org>
@@ -688,16 +688,16 @@ pushfile(const char *name, int secret)
        struct file     *nfile;
 
        if ((nfile = calloc(1, sizeof(struct file))) == NULL) {
-               log_warn("calloc");
+               log_warn("%s", __func__);
                return (NULL);
        }
        if ((nfile->name = strdup(name)) == NULL) {
-               log_warn("strdup");
+               log_warn("%s", __func__);
                free(nfile);
                return (NULL);
        }
        if ((nfile->stream = fopen(nfile->name, "r")) == NULL) {
-               log_warn("%s", nfile->name);
+               log_warn("%s: %s", __func__, nfile->name);
                free(nfile->name);
                free(nfile);
                return (NULL);

diff --git a/usr.sbin/eigrpd/parse.y b/usr.sbin/eigrpd/parse.y
index 22ef12f..7a731c3 100644 (file)
--- a/usr.sbin/eigrpd/parse.y
+++ b/usr.sbin/eigrpd/parse.y
@@ -1,4 +1,4 @@
-/*     $OpenBSD: parse.y,v 1.24 2018/06/11 10:01:04 denis Exp $ */
+/*     $OpenBSD: parse.y,v 1.25 2018/07/09 12:05:11 krw Exp $ */
 
 /*
  * Copyright (c) 2015 Renato Westphal <renato@openbsd.org>
@@ -937,16 +937,16 @@ pushfile(const char *name, int secret)
        struct file     *nfile;
 
        if ((nfile = calloc(1, sizeof(struct file))) == NULL) {
-               log_warn("calloc");
+               log_warn("%s", __func__);
                return (NULL);
        }
        if ((nfile->name = strdup(name)) == NULL) {
-               log_warn("strdup");
+               log_warn("%s", __func__);
                free(nfile);
                return (NULL);
        }
        if ((nfile->stream = fopen(nfile->name, "r")) == NULL) {
-               log_warn("%s", nfile->name);
+               log_warn("%%s: s", __func__, nfile->name);
                free(nfile->name);
                free(nfile);
                return (NULL);
@@ -961,7 +961,7 @@ pushfile(const char *name, int secret)
        nfile->ungetsize = 16;
        nfile->ungetbuf = malloc(nfile->ungetsize);
        if (nfile->ungetbuf == NULL) {
-               log_warn("malloc");
+               log_warn("%s", __func__);
                fclose(nfile->stream);
                free(nfile->name);
                free(nfile);

diff --git a/usr.sbin/hostapd/parse.y b/usr.sbin/hostapd/parse.y
index dbf9796..aef7568 100644 (file)
--- a/usr.sbin/hostapd/parse.y
+++ b/usr.sbin/hostapd/parse.y
@@ -1,4 +1,4 @@
-/*     $OpenBSD: parse.y,v 1.56 2018/06/11 09:09:36 denis Exp $        */
+/*     $OpenBSD: parse.y,v 1.57 2018/07/09 12:05:11 krw Exp $  */
 
 /*
  * Copyright (c) 2004, 2005, 2006 Reyk Floeter <reyk@openbsd.org>
@@ -1729,16 +1729,16 @@ pushfile(const char *name, int secret)
        struct file     *nfile;
 
        if ((nfile = calloc(1, sizeof(struct file))) == NULL) {
-               warn("out of memory");
+               warn("%s", __func__);
                return (NULL);
        }
        if ((nfile->name = strdup(name)) == NULL) {
-               warn("out of memory");
+               warn("%s", __func__);
                free(nfile);
                return (NULL);
        }
        if ((nfile->stream = fopen(nfile->name, "r")) == NULL) {
-               warn("%s", nfile->name);
+               warn("%s: %s", __func__, nfile->name);
                free(nfile->name);
                free(nfile);
                return (NULL);
@@ -1753,7 +1753,7 @@ pushfile(const char *name, int secret)
        nfile->ungetsize = 16;
        nfile->ungetbuf = malloc(nfile->ungetsize);
        if (nfile->ungetbuf == NULL) {
-               warn("malloc");
+               warn("%s", __func__);
                fclose(nfile->stream);
                free(nfile->name);
                free(nfile);

diff --git a/usr.sbin/httpd/parse.y b/usr.sbin/httpd/parse.y
index 49beb33..412b786 100644 (file)
--- 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);

diff --git a/usr.sbin/ifstated/parse.y b/usr.sbin/ifstated/parse.y
index 00047cc..0fad690 100644 (file)
--- a/usr.sbin/ifstated/parse.y
+++ b/usr.sbin/ifstated/parse.y
@@ -1,4 +1,4 @@
-/*     $OpenBSD: parse.y,v 1.50 2018/07/08 17:15:07 krw Exp $  */
+/*     $OpenBSD: parse.y,v 1.51 2018/07/09 12:05:11 krw Exp $  */
 
 /*
  * Copyright (c) 2004 Ryan McBride <mcbride@openbsd.org>
@@ -682,16 +682,16 @@ pushfile(const char *name, int secret)
        struct file     *nfile;
 
        if ((nfile = calloc(1, sizeof(struct file))) == NULL) {
-               warn("calloc");
+               warn("%s", __func__);
                return (NULL);
        }
        if ((nfile->name = strdup(name)) == NULL) {
-               warn("strdup");
+               warn("%s", __func__);
                free(nfile);
                return (NULL);
        }
        if ((nfile->stream = fopen(nfile->name, "r")) == NULL) {
-               warn("%s", nfile->name);
+               warn("%s: %s", __func__, nfile->name);
                free(nfile->name);
                free(nfile);
                return (NULL);

diff --git a/usr.sbin/iscsictl/parse.y b/usr.sbin/iscsictl/parse.y
index fc9b294..7da81d5 100644 (file)
--- a/usr.sbin/iscsictl/parse.y
+++ b/usr.sbin/iscsictl/parse.y
@@ -1,4 +1,4 @@
-/*     $OpenBSD: parse.y,v 1.13 2018/07/08 17:15:07 krw Exp $ */
+/*     $OpenBSD: parse.y,v 1.14 2018/07/09 12:05:11 krw Exp $ */
 
 /*
  * Copyright (c) 2010 David Gwynne <dlg@openbsd.org>
@@ -652,16 +652,16 @@ pushfile(const char *name, int secret)
        struct file     *nfile;
 
        if ((nfile = calloc(1, sizeof(struct file))) == NULL) {
-               warn("calloc");
+               warn("%s", __func__);
                return (NULL);
        }
        if ((nfile->name = strdup(name)) == NULL) {
-               warn("strdup");
+               warn("%s", __func__);
                free(nfile);
                return (NULL);
        }
        if ((nfile->stream = fopen(nfile->name, "r")) == NULL) {
-               warn("%s", nfile->name);
+               warn("%s: %s", __func__, nfile->name);
                free(nfile->name);
                free(nfile);
                return (NULL);
@@ -670,7 +670,7 @@ pushfile(const char *name, int secret)
        nfile->ungetsize = 16;
        nfile->ungetbuf = malloc(nfile->ungetsize);
        if (nfile->ungetbuf == NULL) {
-               warn("malloc");
+               warn("%s", __func__);
                fclose(nfile->stream);
                free(nfile->name);
                free(nfile);

diff --git a/usr.sbin/ldapd/parse.y b/usr.sbin/ldapd/parse.y
index 509e5ed..5df9ed3 100644 (file)
--- a/usr.sbin/ldapd/parse.y
+++ b/usr.sbin/ldapd/parse.y
@@ -1,4 +1,4 @@
-/*     $OpenBSD: parse.y,v 1.30 2018/07/08 17:15:07 krw Exp $ */
+/*     $OpenBSD: parse.y,v 1.31 2018/07/09 12:05:11 krw Exp $ */
 
 /*
  * Copyright (c) 2009, 2010 Martin Hedenfalk <martinh@openbsd.org>
@@ -769,16 +769,16 @@ pushfile(const char *name, int secret)
        log_debug("parsing config %s", name);
 
        if ((nfile = calloc(1, sizeof(struct file))) == NULL) {
-               log_warn("calloc");
+               log_warn("%s", __func__);
                return (NULL);
        }
        if ((nfile->name = strdup(name)) == NULL) {
-               log_warn("strdup");
+               log_warn("%s", __func__);
                free(nfile);
                return (NULL);
        }
        if ((nfile->stream = fopen(nfile->name, "r")) == NULL) {
-               log_warn("%s", nfile->name);
+               log_warn("%s: %s", __func__, nfile->name);
                free(nfile->name);
                free(nfile);
                return (NULL);
@@ -794,7 +794,7 @@ pushfile(const char *name, int secret)
        nfile->ungetsize = 16;
        nfile->ungetbuf = malloc(nfile->ungetsize);
        if (nfile->ungetbuf == NULL) {
-               log_warn("malloc");
+               log_warn("%s", __func__);
                fclose(nfile->stream);
                free(nfile->name);
                free(nfile);

diff --git a/usr.sbin/ldomctl/parse.y b/usr.sbin/ldomctl/parse.y
index f986d83..edcb086 100644 (file)
--- a/usr.sbin/ldomctl/parse.y
+++ b/usr.sbin/ldomctl/parse.y
@@ -1,4 +1,4 @@
-/*     $OpenBSD: parse.y,v 1.6 2014/11/20 05:51:20 jsg Exp $   */
+/*     $OpenBSD: parse.y,v 1.7 2018/07/09 12:05:11 krw Exp $   */
 
 /*
  * Copyright (c) 2012 Mark Kettenis <kettenis@openbsd.org>
@@ -489,7 +489,7 @@ pushfile(const char *name)
        nfile = xzalloc(sizeof(struct file));
        nfile->name = xstrdup(name);
        if ((nfile->stream = fopen(nfile->name, "r")) == NULL) {
-               warn("%s", nfile->name);
+               warn("%s: %s", __func__, nfile->name);
                free(nfile->name);
                free(nfile);
                return (NULL);

diff --git a/usr.sbin/ldpd/parse.y b/usr.sbin/ldpd/parse.y
index a638b6a..ff2aa80 100644 (file)
--- a/usr.sbin/ldpd/parse.y
+++ b/usr.sbin/ldpd/parse.y
@@ -1,4 +1,4 @@
-/*     $OpenBSD: parse.y,v 1.63 2018/06/11 09:34:46 denis Exp $ */
+/*     $OpenBSD: parse.y,v 1.64 2018/07/09 12:05:11 krw Exp $ */
 
 /*
  * Copyright (c) 2013, 2015, 2016 Renato Westphal <renato@openbsd.org>
@@ -1160,16 +1160,16 @@ pushfile(const char *name, int secret)
        struct file     *nfile;
 
        if ((nfile = calloc(1, sizeof(struct file))) == NULL) {
-               log_warn("calloc");
+               log_warn("%s", __func__);
                return (NULL);
        }
        if ((nfile->name = strdup(name)) == NULL) {
-               log_warn("strdup");
+               log_warn("%s", __func__);
                free(nfile);
                return (NULL);
        }
        if ((nfile->stream = fopen(nfile->name, "r")) == NULL) {
-               log_warn("%s", nfile->name);
+               log_warn("%s: %s", __func__, nfile->name);
                free(nfile->name);
                free(nfile);
                return (NULL);
@@ -1184,7 +1184,7 @@ pushfile(const char *name, int secret)
        nfile->ungetsize = 16;
        nfile->ungetbuf = malloc(nfile->ungetsize);
        if (nfile->ungetbuf == NULL) {
-               log_warn("malloc");
+               log_warn("%s", __func__);
                fclose(nfile->stream);
                free(nfile->name);
                free(nfile);

diff --git a/usr.sbin/lpd/parse.y b/usr.sbin/lpd/parse.y
index dca6c10..608818e 100644 (file)
--- a/usr.sbin/lpd/parse.y
+++ b/usr.sbin/lpd/parse.y
@@ -1,4 +1,4 @@
-/*     $OpenBSD: parse.y,v 1.1.1.1 2018/04/27 16:14:37 eric Exp $      */
+/*     $OpenBSD: parse.y,v 1.2 2018/07/09 12:05:11 krw Exp $   */
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -549,16 +549,16 @@ pushfile(const char *name, int secret)
        struct file     *nfile;
 
        if ((nfile = calloc(1, sizeof(struct file))) == NULL) {
-               log_warn("warn: malloc");
+               log_warn("%s", __func__);
                return (NULL);
        }
        if ((nfile->name = strdup(name)) == NULL) {
-               log_warn("warn: malloc");
+               log_warn("%s", __func__);
                free(nfile);
                return (NULL);
        }
        if ((nfile->stream = fopen(nfile->name, "r")) == NULL) {
-               log_warn("warn: %s", nfile->name);
+               log_warn("%s: %s", __func__, nfile->name);
                free(nfile->name);
                free(nfile);
                return (NULL);

diff --git a/usr.sbin/npppd/npppd/parse.y b/usr.sbin/npppd/npppd/parse.y
index 1c7042f..ca62078 100644 (file)
--- a/usr.sbin/npppd/npppd/parse.y
+++ b/usr.sbin/npppd/npppd/parse.y
@@ -1,4 +1,4 @@
-/*     $OpenBSD: parse.y,v 1.20 2018/07/08 17:15:07 krw Exp $ */
+/*     $OpenBSD: parse.y,v 1.21 2018/07/09 12:05:11 krw Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -1329,11 +1329,11 @@ pushfile(const char *name)
        struct file     *nfile;
 
        if ((nfile = calloc(1, sizeof(struct file))) == NULL) {
-               log_warn("calloc");
+               log_warn("%s", __func__);
                return (NULL);
        }
        if ((nfile->name = strdup(name)) == NULL) {
-               log_warn("strdup");
+               log_warn("%s", __func__);
                free(nfile);
                return (NULL);
        }
@@ -1342,7 +1342,7 @@ pushfile(const char *name)
 #else
        if ((nfile->stream = priv_fopen(nfile->name)) == NULL) {
 #endif
-               log_warn("%s", nfile->name);
+               log_warn("%s: %s", __func__, nfile->name);
                free(nfile->name);
                free(nfile);
                return (NULL);

diff --git a/usr.sbin/ntpd/parse.y b/usr.sbin/ntpd/parse.y
index 52e3013..e30926b 100644 (file)
--- a/usr.sbin/ntpd/parse.y
+++ b/usr.sbin/ntpd/parse.y
@@ -1,4 +1,4 @@
-/*     $OpenBSD: parse.y,v 1.68 2018/07/08 17:15:07 krw Exp $ */
+/*     $OpenBSD: parse.y,v 1.69 2018/07/09 12:05:11 krw Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -733,16 +733,16 @@ pushfile(const char *name)
        struct file     *nfile;
 
        if ((nfile = calloc(1, sizeof(struct file))) == NULL) {
-               log_warn("calloc");
+               log_warn("%s", __func__);
                return (NULL);
        }
        if ((nfile->name = strdup(name)) == NULL) {
-               log_warn("strdup");
+               log_warn("%s", __func__);
                free(nfile);
                return (NULL);
        }
        if ((nfile->stream = fopen(nfile->name, "r")) == NULL) {
-               log_warn("%s", nfile->name);
+               log_warn("%s: %s", __func__, nfile->name);
                free(nfile->name);
                free(nfile);
                return (NULL);

diff --git a/usr.sbin/ospf6d/parse.y b/usr.sbin/ospf6d/parse.y
index 33a3ca8..833bb72 100644 (file)
--- a/usr.sbin/ospf6d/parse.y
+++ b/usr.sbin/ospf6d/parse.y
@@ -1,4 +1,4 @@
-/*     $OpenBSD: parse.y,v 1.33 2018/07/08 17:15:07 krw Exp $ */
+/*     $OpenBSD: parse.y,v 1.34 2018/07/09 12:05:11 krw Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
@@ -882,16 +882,16 @@ pushfile(const char *name, int secret)
        struct file     *nfile;
 
        if ((nfile = calloc(1, sizeof(struct file))) == NULL) {
-               log_warn("calloc");
+               log_warn("%s", __func__);
                return (NULL);
        }
        if ((nfile->name = strdup(name)) == NULL) {
-               log_warn("strdup");
+               log_warn("%s", __func__);
                free(nfile);
                return (NULL);
        }
        if ((nfile->stream = fopen(nfile->name, "r")) == NULL) {
-               log_warn("%s", nfile->name);
+               log_warn("%s: %s", __func__, nfile->name);
                free(nfile->name);
                free(nfile);
                return (NULL);
@@ -906,7 +906,7 @@ pushfile(const char *name, int secret)
        nfile->ungetsize = 16;
        nfile->ungetbuf = malloc(nfile->ungetsize);
        if (nfile->ungetbuf == NULL) {
-               log_warn("malloc");
+               log_warn("%s", __func__);
                fclose(nfile->stream);
                free(nfile->name);
                free(nfile);

diff --git a/usr.sbin/ospfd/parse.y b/usr.sbin/ospfd/parse.y
index 2f1def0..ef25c23 100644 (file)
--- a/usr.sbin/ospfd/parse.y
+++ b/usr.sbin/ospfd/parse.y
@@ -1,4 +1,4 @@
-/*     $OpenBSD: parse.y,v 1.89 2018/07/08 17:15:07 krw Exp $ */
+/*     $OpenBSD: parse.y,v 1.90 2018/07/09 12:05:11 krw Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
@@ -1127,16 +1127,16 @@ pushfile(const char *name, int secret)
        struct file     *nfile;
 
        if ((nfile = calloc(1, sizeof(struct file))) == NULL) {
-               log_warn("calloc");
+               log_warn("%s", __func__);
                return (NULL);
        }
        if ((nfile->name = strdup(name)) == NULL) {
-               log_warn("strdup");
+               log_warn("%s", __func__);
                free(nfile);
                return (NULL);
        }
        if ((nfile->stream = fopen(nfile->name, "r")) == NULL) {
-               log_warn("%s", nfile->name);
+               log_warn("%s: %s", __func__, nfile->name);
                free(nfile->name);
                free(nfile);
                return (NULL);
@@ -1151,7 +1151,7 @@ pushfile(const char *name, int secret)
        nfile->ungetsize = 16;
        nfile->ungetbuf = malloc(nfile->ungetsize);
        if (nfile->ungetbuf == NULL) {
-               log_warn("malloc");
+               log_warn("%s", __func__);
                fclose(nfile->stream);
                free(nfile->name);
                free(nfile);

diff --git a/usr.sbin/radiusd/parse.y b/usr.sbin/radiusd/parse.y
index 20caf10..0b4a9b9 100644 (file)
--- a/usr.sbin/radiusd/parse.y
+++ b/usr.sbin/radiusd/parse.y
@@ -1,4 +1,4 @@
-/*     $OpenBSD: parse.y,v 1.5 2018/07/08 17:15:07 krw Exp $   */
+/*     $OpenBSD: parse.y,v 1.6 2018/07/09 12:05:11 krw Exp $   */
 
 /*
  * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -661,16 +661,16 @@ pushfile(const char *name)
        struct file     *nfile;
 
        if ((nfile = calloc(1, sizeof(struct file))) == NULL) {
-               log_warn("calloc");
+               log_warn("%s", __func__);
                return (NULL);
        }
        if ((nfile->name = strdup(name)) == NULL) {
-               log_warn("strdup");
+               log_warn("%s", __func__);
                free(nfile);
                return (NULL);
        }
        if ((nfile->stream = fopen(nfile->name, "r")) == NULL) {
-               log_warn("%s", nfile->name);
+               log_warn("%s: %s", __func__, nfile->name);
                free(nfile->name);
                free(nfile);
                return (NULL);

diff --git a/usr.sbin/relayd/parse.y b/usr.sbin/relayd/parse.y
index e76beea..414f255 100644 (file)
--- a/usr.sbin/relayd/parse.y
+++ b/usr.sbin/relayd/parse.y
@@ -1,4 +1,4 @@
-/*     $OpenBSD: parse.y,v 1.224 2018/06/11 18:18:00 denis Exp $       */
+/*     $OpenBSD: parse.y,v 1.225 2018/07/09 12:05:11 krw Exp $ */
 
 /*
  * Copyright (c) 2007 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -2617,11 +2617,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);
        }
@@ -2641,7 +2641,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);

diff --git a/usr.sbin/ripd/parse.y b/usr.sbin/ripd/parse.y
index ef6e4e9..7d805b7 100644 (file)
--- a/usr.sbin/ripd/parse.y
+++ b/usr.sbin/ripd/parse.y
@@ -1,4 +1,4 @@
-/*     $OpenBSD: parse.y,v 1.39 2018/07/08 17:15:07 krw Exp $ */
+/*     $OpenBSD: parse.y,v 1.40 2018/07/09 12:05:11 krw Exp $ */
 
 /*
  * Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it>
@@ -713,16 +713,16 @@ pushfile(const char *name, int secret)
        struct file     *nfile;
 
        if ((nfile = calloc(1, sizeof(struct file))) == NULL) {
-               log_warn("calloc");
+               log_warn("%s", __func__);
                return (NULL);
        }
        if ((nfile->name = strdup(name)) == NULL) {
-               log_warn("strdup");
+               log_warn("%s", __func__);
                free(nfile);
                return (NULL);
        }
        if ((nfile->stream = fopen(nfile->name, "r")) == NULL) {
-               log_warn("%s", nfile->name);
+               log_warn("%s: %s", __func__, nfile->name);
                free(nfile->name);
                free(nfile);
                return (NULL);

diff --git a/usr.sbin/smtpd/parse.y b/usr.sbin/smtpd/parse.y
index b7e0649..f8a2b77 100644 (file)
--- a/usr.sbin/smtpd/parse.y
+++ b/usr.sbin/smtpd/parse.y
@@ -1,4 +1,4 @@
-/*     $OpenBSD: parse.y,v 1.214 2018/06/18 18:19:14 gilles Exp $      */
+/*     $OpenBSD: parse.y,v 1.215 2018/07/09 12:05:11 krw Exp $ */
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -1975,16 +1975,16 @@ pushfile(const char *name, int secret)
        struct file     *nfile;
 
        if ((nfile = calloc(1, sizeof(struct file))) == NULL) {
-               log_warn("warn: malloc");
+               log_warn("%s", __func__);
                return (NULL);
        }
        if ((nfile->name = strdup(name)) == NULL) {
-               log_warn("warn: malloc");
+               log_warn("%s", __func__);
                free(nfile);
                return (NULL);
        }
        if ((nfile->stream = fopen(nfile->name, "r")) == NULL) {
-               log_warn("warn: %s", nfile->name);
+               log_warn("%s: %s", __func__, nfile->name);
                free(nfile->name);
                free(nfile);
                return (NULL);
@@ -1999,7 +1999,7 @@ pushfile(const char *name, int secret)
        nfile->ungetsize = 16;
        nfile->ungetbuf = malloc(nfile->ungetsize);
        if (nfile->ungetbuf == NULL) {
-               log_warn("warn: malloc");
+               log_warn("%s", __func__);
                fclose(nfile->stream);
                free(nfile->name);
                free(nfile);

diff --git a/usr.sbin/snmpd/parse.y b/usr.sbin/snmpd/parse.y
index 35e6c62..12cbd60 100644 (file)
--- a/usr.sbin/snmpd/parse.y
+++ b/usr.sbin/snmpd/parse.y
@@ -1,4 +1,4 @@
-/*     $OpenBSD: parse.y,v 1.49 2018/07/08 17:15:07 krw Exp $  */
+/*     $OpenBSD: parse.y,v 1.50 2018/07/09 12:05:11 krw Exp $  */
 
 /*
  * Copyright (c) 2007, 2008, 2012 Reyk Floeter <reyk@openbsd.org>
@@ -953,16 +953,16 @@ pushfile(const char *name, int secret)
        struct file     *nfile;
 
        if ((nfile = calloc(1, sizeof(struct file))) == NULL) {
-               log_warn("calloc");
+               log_warn("%s", __func__);
                return (NULL);
        }
        if ((nfile->name = strdup(name)) == NULL) {
-               log_warn("strdup");
+               log_warn("%s", __func__);
                free(nfile);
                return (NULL);
        }
        if ((nfile->stream = fopen(nfile->name, "r")) == NULL) {
-               log_warn("%s", nfile->name);
+               log_warn("%s: %s", __func__, nfile->name);
                free(nfile->name);
                free(nfile);
                return (NULL);
@@ -977,7 +977,7 @@ pushfile(const char *name, int secret)
        nfile->ungetsize = 16;
        nfile->ungetbuf = malloc(nfile->ungetsize);
        if (nfile->ungetbuf == NULL) {
-               log_warn("malloc");
+               log_warn("%s", __func__);
                fclose(nfile->stream);
                free(nfile->name);
                free(nfile);
@@ -1012,7 +1012,7 @@ parse_config(const char *filename, u_int flags)
        int found;
 
        if ((conf = calloc(1, sizeof(*conf))) == NULL) {
-               log_warn("cannot allocate memory");
+               log_warn("%s", __func__);
                return (NULL);
        }
 

diff --git a/usr.sbin/switchd/parse.y b/usr.sbin/switchd/parse.y
index 9128fcb..f10899c 100644 (file)
--- a/usr.sbin/switchd/parse.y
+++ b/usr.sbin/switchd/parse.y
@@ -1,4 +1,4 @@
-/*     $OpenBSD: parse.y,v 1.8 2018/07/08 17:15:07 krw Exp $   */
+/*     $OpenBSD: parse.y,v 1.9 2018/07/09 12:05:11 krw Exp $   */
 
 /*
  * Copyright (c) 2007-2016 Reyk Floeter <reyk@openbsd.org>
@@ -573,11 +573,11 @@ pushfile(const char *name, int secret)
        struct file     *nfile;
 
        if ((nfile = calloc(1, sizeof(struct file))) == NULL) {
-               log_warn("calloc");
+               log_warn("%s", __func__);
                return (NULL);
        }
        if ((nfile->name = strdup(name)) == NULL) {
-               log_warn("strdup");
+               log_warn("%s", __func__);
                free(nfile);
                return (NULL);
        }
@@ -590,7 +590,7 @@ pushfile(const char *name, int secret)
        nfile->ungetsize = 16;
        nfile->ungetbuf = malloc(nfile->ungetsize);
        if (nfile->ungetbuf == NULL) {
-               log_warn("malloc");
+               log_warn("%s", __func__);
                fclose(nfile->stream);
                free(nfile->name);
                free(nfile);

diff --git a/usr.sbin/vmd/parse.y b/usr.sbin/vmd/parse.y
index db6f834..af0c949 100644 (file)
--- a/usr.sbin/vmd/parse.y
+++ b/usr.sbin/vmd/parse.y
@@ -1,4 +1,4 @@
-/*     $OpenBSD: parse.y,v 1.37 2018/07/08 17:15:07 krw Exp $  */
+/*     $OpenBSD: parse.y,v 1.38 2018/07/09 12:05:11 krw Exp $  */
 
 /*
  * Copyright (c) 2007-2016 Reyk Floeter <reyk@openbsd.org>
@@ -972,11 +972,11 @@ pushfile(const char *name, int secret)
        struct file     *nfile;
 
        if ((nfile = calloc(1, sizeof(struct file))) == NULL) {
-               log_warn("calloc");
+               log_warn("%s", __func__);
                return (NULL);
        }
        if ((nfile->name = strdup(name)) == NULL) {
-               log_warn("strdup");
+               log_warn("%s", __func__);
                free(nfile);
                return (NULL);
        }
@@ -989,7 +989,7 @@ pushfile(const char *name, int secret)
        nfile->ungetsize = 16;
        nfile->ungetbuf = malloc(nfile->ungetsize);
        if (nfile->ungetbuf == NULL) {
-               log_warn("malloc");
+               log_warn("%s", __func__);
                fclose(nfile->stream);
                free(nfile->name);
                free(nfile);
@@ -1188,7 +1188,7 @@ host(const char *str, struct address *h)
        const char              *errstr;
 
        if ((s = strdup(str)) == NULL) {
-               log_warn("strdup");
+               log_warn("%s", __func__);
                goto fail;
        }
 

diff --git a/usr.sbin/ypldap/parse.y b/usr.sbin/ypldap/parse.y
index 6373514..c3e7c98 100644 (file)
--- a/usr.sbin/ypldap/parse.y
+++ b/usr.sbin/ypldap/parse.y
@@ -1,4 +1,4 @@
-/*     $OpenBSD: parse.y,v 1.26 2018/07/08 17:15:07 krw Exp $  */
+/*     $OpenBSD: parse.y,v 1.27 2018/07/09 12:05:11 krw Exp $  */
 
 /*
  * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -781,16 +781,16 @@ pushfile(const char *name, int secret)
        struct file     *nfile;
 
        if ((nfile = calloc(1, sizeof(struct file))) == NULL) {
-               log_warn("calloc");
+               log_warn("%s", __func__);
                return (NULL);
        }
        if ((nfile->name = strdup(name)) == NULL) {
-               log_warn("strdup");
+               log_warn("%s", __func__);
                free(nfile);
                return (NULL);
        }
        if ((nfile->stream = fopen(nfile->name, "r")) == NULL) {
-               log_warn("%s", nfile->name);
+               log_warn("%s: %s", __func__, nfile->name);
                free(nfile->name);
                free(nfile);
                return (NULL);
@@ -805,7 +805,7 @@ pushfile(const char *name, int secret)
        nfile->ungetsize = 16;
        nfile->ungetbuf = malloc(nfile->ungetsize);
        if (nfile->ungetbuf == NULL) {
-               log_warn("malloc");
+               log_warn("%s", __func__);
                fclose(nfile->stream);
                free(nfile->name);
                free(nfile);
@@ -845,7 +845,7 @@ parse_config(struct env *x_conf, const char *filename, int opts)
        conf->sc_conf_tv.tv_usec = 0;
        conf->sc_cafile = strdup(YPLDAP_CERT_FILE);
        if (conf->sc_cafile == NULL) {
-               log_warn("strdup");
+               log_warn("%s", __func__);
                return (-1);
        }