summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2003-11-06 15:16:51 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2003-11-06 15:16:51 +0000
commit214492f22979ab4d07764a13b9caf5d078fa0ec4 (patch)
tree870d50d143fe8a579cf4f3bea4fcc4e27fc17c1b
parent1edee22a4547160bcbf762d4c38553148fc4665a (diff)
and fix two err() that should be errx() while beeing here
-rw-r--r--sbin/pfctl/parse.y8
1 files changed, 4 insertions, 4 deletions
diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y
index 1d75b894ba4..54a36cf53ef 100644
--- a/sbin/pfctl/parse.y
+++ b/sbin/pfctl/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.419 2003/11/06 15:13:22 henning Exp $ */
+/* $OpenBSD: parse.y,v 1.420 2003/11/06 15:16:50 henning Exp $ */
/*
* Copyright (c) 2001 Markus Friedl. All rights reserved.
@@ -3313,18 +3313,18 @@ expand_label_str(char *label, size_t len, const char *srch, const char *repl)
char *p, *q;
if ((tmp = calloc(1, len)) == NULL)
- err(1, "expand_label_str");
+ err(1, "expand_label_str: calloc");
p = q = label;
while ((q = strstr(p, srch)) != NULL) {
*q = '\0';
if ((strlcat(tmp, p, len) >= len) ||
(strlcat(tmp, repl, len) >= len))
- err(1, "expand_label: label too long");
+ errx(1, "expand_label: label too long");
q += strlen(srch);
p = q;
}
if (strlcat(tmp, p, len) >= len)
- err(1, "expand_label: label too long");
+ errx(1, "expand_label: label too long");
strlcpy(label, tmp, len); /* always fits */
free(tmp);
}