From 674c1ef69f302980c6def35911c1ee3c4b68cef2 Mon Sep 17 00:00:00 2001 From: Reyk Floeter Date: Thu, 20 Aug 2015 16:14:26 +0200 Subject: sync CVS commitid: WDQybNKi4LiEFw8K: Change httpd(8) to use C99-style fixed-width integers (uintN_t instead of u_intN_t) and replace u_int with unsigned int. Mixing both variants is a bad style and most contributors seem to prefer this style; it also helps us to get used to it, portability, and standardization. Theoretically no binary change, except one in practice: httpd.o has a different checksum because gcc with -O2 pads/optimizes "struct privsep" differently when using "unsigned int" instead "u_int" for the affected members. "u_int" is just a typedef of "unsigned int", -O0 doesn't build the difference and clang with -O2 doesn't do it either - it is just another curiosity from gcc-land. OK semarie@ --- httpd/server.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'httpd/server.c') diff --git a/httpd/server.c b/httpd/server.c index ffd6d30..21593bf 100644 --- a/httpd/server.c +++ b/httpd/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.74 2015/08/03 11:45:17 florian Exp $ */ +/* $OpenBSD: server.c,v 1.75 2015/08/20 13:00:23 reyk Exp $ */ /* * Copyright (c) 2006 - 2015 Reyk Floeter @@ -74,7 +74,7 @@ extern void bufferevent_read_pressure_cb(struct evbuffer *, size_t, volatile int server_clients; volatile int server_inflight = 0; -u_int32_t server_cltid; +uint32_t server_cltid; static struct httpd *env = NULL; int proc_id; @@ -356,7 +356,7 @@ server_byaddr(struct sockaddr *addr, in_port_t port) } struct server_config * -serverconfig_byid(u_int32_t id) +serverconfig_byid(uint32_t id) { struct server *srv; struct server_config *srv_conf; -- cgit v1.2.3-54-g00ecf