aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--httpd/parse.y7
-rw-r--r--httpd/server_http.c2
2 files changed, 4 insertions, 5 deletions
diff --git a/httpd/parse.y b/httpd/parse.y
index 0b79585..8622d84 100644
--- a/httpd/parse.y
+++ b/httpd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.75 2015/08/20 13:00:23 reyk Exp $ */
+/* $OpenBSD: parse.y,v 1.76 2015/08/20 22:39:29 deraadt Exp $ */
/*
* Copyright (c) 2007 - 2015 Reyk Floeter <reyk@openbsd.org>
@@ -2116,9 +2116,8 @@ is_if_in_group(const char *ifname, const char *groupname)
}
len = ifgr.ifgr_len;
- ifgr.ifgr_groups =
- (struct ifg_req *)calloc(len / sizeof(struct ifg_req),
- sizeof(struct ifg_req));
+ ifgr.ifgr_groups = calloc(len / sizeof(struct ifg_req),
+ sizeof(struct ifg_req));
if (ifgr.ifgr_groups == NULL)
err(1, "getifgroups");
if (ioctl(s, SIOCGIFGROUP, (caddr_t)&ifgr) == -1)
diff --git a/httpd/server_http.c b/httpd/server_http.c
index 6b919f2..8ed98b5 100644
--- a/httpd/server_http.c
+++ b/httpd/server_http.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server_http.c,v 1.97 2015/08/20 13:00:23 reyk Exp $ */
+/* $OpenBSD: server_http.c,v 1.98 2015/08/21 07:30:50 reyk Exp $ */
/*
* Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org>