From 1940bab65298e7818918bcfc615db8c865dc576b Mon Sep 17 00:00:00 2001 From: reyk Date: Fri, 25 Jul 2014 12:46:23 +0000 Subject: [PATCH] Rename a field, needed later, no functional change. --- usr.sbin/httpd/httpd.h | 6 +++--- usr.sbin/httpd/server.c | 10 +++++----- usr.sbin/httpd/server_file.c | 4 ++-- usr.sbin/httpd/server_http.c | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/usr.sbin/httpd/httpd.h b/usr.sbin/httpd/httpd.h index 1f259ffc10e..35c2d573c79 100644 --- a/usr.sbin/httpd/httpd.h +++ b/usr.sbin/httpd/httpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: httpd.h,v 1.9 2014/07/25 12:42:05 reyk Exp $ */ +/* $OpenBSD: httpd.h,v 1.10 2014/07/25 12:46:23 reyk Exp $ */ /* * Copyright (c) 2006 - 2014 Reyk Floeter @@ -252,8 +252,8 @@ struct privsep_proc { struct client { u_int32_t clt_id; pid_t clt_pid; - void *clt_server; - u_int32_t clt_serverid; + void *clt_srv; + u_int32_t clt_srv_id; int clt_s; in_port_t clt_port; diff --git a/usr.sbin/httpd/server.c b/usr.sbin/httpd/server.c index 913dbb51b26..2b8f0a03bd5 100644 --- a/usr.sbin/httpd/server.c +++ b/usr.sbin/httpd/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.8 2014/07/24 08:32:36 reyk Exp $ */ +/* $OpenBSD: server.c,v 1.9 2014/07/25 12:46:23 reyk Exp $ */ /* * Copyright (c) 2006 - 2014 Reyk Floeter @@ -316,7 +316,7 @@ server_socket_listen(struct sockaddr_storage *ss, in_port_t port, void server_input(struct client *clt) { - struct server *srv = clt->clt_server; + struct server *srv = clt->clt_srv; evbuffercb inrd = server_read; evbuffercb inwr = server_write; @@ -472,9 +472,9 @@ server_accept(int fd, short event, void *arg) clt->clt_s = s; clt->clt_fd = -1; clt->clt_toread = TOREAD_UNLIMITED; - clt->clt_server = srv; + clt->clt_srv = srv; clt->clt_id = ++server_cltid; - clt->clt_serverid = srv->srv_conf.id; + clt->clt_srv_id = srv->srv_conf.id; clt->clt_pid = getpid(); clt->clt_inflight = 1; switch (ss.ss_family) { @@ -546,7 +546,7 @@ void server_close(struct client *clt, const char *msg) { char ibuf[128], obuf[128], *ptr = NULL; - struct server *srv = clt->clt_server; + struct server *srv = clt->clt_srv; SPLAY_REMOVE(client_tree, &srv->srv_clients, clt); diff --git a/usr.sbin/httpd/server_file.c b/usr.sbin/httpd/server_file.c index c713394b908..b4c593c0a91 100644 --- a/usr.sbin/httpd/server_file.c +++ b/usr.sbin/httpd/server_file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server_file.c,v 1.11 2014/07/25 12:42:05 reyk Exp $ */ +/* $OpenBSD: server_file.c,v 1.12 2014/07/25 12:46:23 reyk Exp $ */ /* * Copyright (c) 2006 - 2014 Reyk Floeter @@ -119,7 +119,7 @@ int server_file(struct httpd *env, struct client *clt) { struct http_descriptor *desc = clt->clt_desc; - struct server *srv = clt->clt_server; + struct server *srv = clt->clt_srv; struct media_type *media; const char *errstr = NULL; int fd = -1, ret; diff --git a/usr.sbin/httpd/server_http.c b/usr.sbin/httpd/server_http.c index 21b4684bbea..1d14b7775fb 100644 --- a/usr.sbin/httpd/server_http.c +++ b/usr.sbin/httpd/server_http.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server_http.c,v 1.11 2014/07/24 08:32:36 reyk Exp $ */ +/* $OpenBSD: server_http.c,v 1.12 2014/07/25 12:46:23 reyk Exp $ */ /* * Copyright (c) 2006 - 2014 Reyk Floeter @@ -518,7 +518,7 @@ server_reset_http(struct client *clt) void server_abort_http(struct client *clt, u_int code, const char *msg) { - struct server *srv = clt->clt_server; + struct server *srv = clt->clt_srv; struct bufferevent *bev = clt->clt_bev; const char *httperr = NULL, *text = ""; char *httpmsg, *extraheader = NULL; -- 2.20.1