summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormillert <millert@openbsd.org>2021-01-08 22:05:34 +0000
committermillert <millert@openbsd.org>2021-01-08 22:05:34 +0000
commitf178db2017f5d75eb102879bcee02379b5f70f69 (patch)
tree05cd2f2a72312a5f45a61aae5ecf0aca1ac09655
parentProvide "Point-to-Multipoint Layer 3 GRE tunnel interfaces (mgre) example" (diff)
downloadwireguard-openbsd-f178db2017f5d75eb102879bcee02379b5f70f69.tar.xz
wireguard-openbsd-f178db2017f5d75eb102879bcee02379b5f70f69.zip
accept_reserve() counter function argument doesn't need to be volatile.
Revision 1.21 removed the volatile from the cgi_inflight global but accept_reserve() was not updated to match. OK florian@
-rw-r--r--usr.sbin/slowcgi/slowcgi.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/slowcgi/slowcgi.c b/usr.sbin/slowcgi/slowcgi.c
index 4797c47bc80..dc239047fef 100644
--- a/usr.sbin/slowcgi/slowcgi.c
+++ b/usr.sbin/slowcgi/slowcgi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: slowcgi.c,v 1.57 2020/05/11 10:40:12 claudio Exp $ */
+/* $OpenBSD: slowcgi.c,v 1.58 2021/01/08 22:05:34 millert Exp $ */
/*
* Copyright (c) 2013 David Gwynne <dlg@openbsd.org>
* Copyright (c) 2013 Florian Obser <florian@openbsd.org>
@@ -166,8 +166,7 @@ struct fcgi_end_request_body {
__dead void usage(void);
int slowcgi_listen(char *, struct passwd *);
void slowcgi_paused(int, short, void *);
-int accept_reserve(int, struct sockaddr *, socklen_t *, int,
- volatile int *);
+int accept_reserve(int, struct sockaddr *, socklen_t *, int, int *);
void slowcgi_accept(int, short, void *);
void slowcgi_request(int, short, void *);
void slowcgi_response(int, short, void *);
@@ -432,7 +431,7 @@ slowcgi_paused(int fd, short events, void *arg)
int
accept_reserve(int sockfd, struct sockaddr *addr, socklen_t *addrlen,
- int reserve, volatile int *counter)
+ int reserve, int *counter)
{
int ret;
if (getdtablecount() + reserve +