[multiple] prefer (connection *) to (srv *)

convert all log_error_write() to log_error() and pass (log_error_st *)

use con->errh in preference to srv->errh (even though currently same)

avoid passing (server *) when previously used only for logging (errh)

1 files changed, 12 insertions, 13 deletions

diff --git a/src/response.h b/src/response.h
index 6f4938a8..c6b367ae 100644
--- a/src/response.h
+++ b/src/response.h
@@ -9,7 +9,7 @@
 #include <time.h>
 
 int http_response_parse(server *srv, connection *con);
-int http_response_write_header(server *srv, connection *con);
+int http_response_write_header(connection *con);
 
 typedef struct http_cgi_opts_t {
   int authorizer;
@@ -34,24 +34,23 @@ typedef struct http_response_opts_t {
   unsigned short xsendfile_allow;
   const array *xsendfile_docroot;
   void *pdata;
-  handler_t(*parse)(server *, connection *, struct http_response_opts_t *, buffer *, size_t);
-  handler_t(*headers)(server *, connection *, struct http_response_opts_t *);
+  handler_t(*parse)(connection *, struct http_response_opts_t *, buffer *, size_t);
+  handler_t(*headers)(connection *, struct http_response_opts_t *);
 } http_response_opts;
 
 typedef int (*http_cgi_header_append_cb)(void *vdata, const char *k, size_t klen, const char *v, size_t vlen);
-int http_cgi_headers(server *srv, connection *con, http_cgi_opts *opts, http_cgi_header_append_cb cb, void *vdata);
+int http_cgi_headers(connection *con, http_cgi_opts *opts, http_cgi_header_append_cb cb, void *vdata);
 
-handler_t http_response_parse_headers(server *srv, connection *con, http_response_opts *opts, buffer *hdrs);
-handler_t http_response_read(server *srv, connection *con, http_response_opts *opts, buffer *b, fdnode *fdn);
+handler_t http_response_parse_headers(connection *con, http_response_opts *opts, buffer *hdrs);
+handler_t http_response_read(connection *con, http_response_opts *opts, buffer *b, fdnode *fdn);
 handler_t http_response_prepare(server *srv, connection *con);
-int http_response_buffer_append_authority(server *srv, connection *con, buffer *b);
-int http_response_redirect_to_directory(server *srv, connection *con, int status);
-int http_response_handle_cachable(server *srv, connection *con, const buffer * mtime);
+int http_response_redirect_to_directory(connection *con, int status);
+int http_response_handle_cachable(connection *con, const buffer * mtime);
 void http_response_body_clear(connection *con, int preserve_length);
-void http_response_send_file (server *srv, connection *con, buffer *path);
-void http_response_backend_done (server *srv, connection *con);
-void http_response_backend_error (server *srv, connection *con);
-void http_response_upgrade_read_body_unknown(server *srv, connection *con);
+void http_response_send_file (connection *con, buffer *path);
+void http_response_backend_done (connection *con);
+void http_response_backend_error (connection *con);
+void http_response_upgrade_read_body_unknown(connection *con);
 
 const buffer * strftime_cache_get(server *srv, time_t last_mod);
 #endif