From: wessels <> Date: Thu, 29 Sep 2005 02:26:27 +0000 (+0000) Subject: cosmetic: renaming HttpStateData's body_buf to request_body_buf to X-Git-Tag: SQUID_3_0_PRE4~593 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=29b6566294c25359f78a18a1cdfedef8f769c30d;p=thirdparty%2Fsquid.git cosmetic: renaming HttpStateData's body_buf to request_body_buf to clarify its purpose. --- diff --git a/src/http.cc b/src/http.cc index 20b4148bbf..f1c31d6d7b 100644 --- a/src/http.cc +++ b/src/http.cc @@ -1,6 +1,6 @@ /* - * $Id: http.cc,v 1.460 2005/09/28 19:52:52 wessels Exp $ + * $Id: http.cc,v 1.461 2005/09/28 20:26:27 wessels Exp $ * * DEBUG: section 11 Hypertext Transfer Protocol (HTTP) * AUTHOR: Harvest Derived @@ -81,14 +81,14 @@ httpStateFree(int fd, void *data) if (httpState == NULL) return; - if (httpState->body_buf) { + if (httpState->request_body_buf) { if (httpState->orig_request->body_connection.getRaw()) { clientAbortBody(httpState->orig_request); } - if (httpState->body_buf) { - memFree(httpState->body_buf, MEM_8K_BUF); - httpState->body_buf = NULL; + if (httpState->request_body_buf) { + memFree(httpState->request_body_buf, MEM_8K_BUF); + httpState->request_body_buf = NULL; } } @@ -1817,7 +1817,7 @@ static void httpRequestBodyHandler(char *buf, ssize_t size, void *data) { HttpStateData *httpState = (HttpStateData *) data; - httpState->body_buf = NULL; + httpState->request_body_buf = NULL; if (size > 0) { if (httpState->flags.headers_parsed && !httpState->flags.abuse_detected) { @@ -1876,8 +1876,8 @@ httpSendRequestEntity(int fd, char *bufnotused, size_t size, comm_err_t errflag, return; } - httpState->body_buf = (char *)memAllocate(MEM_8K_BUF); - clientReadBody(httpState->orig_request, httpState->body_buf, 8192, httpRequestBodyHandler, httpState); + httpState->request_body_buf = (char *)memAllocate(MEM_8K_BUF); + clientReadBody(httpState->orig_request, httpState->request_body_buf, 8192, httpRequestBodyHandler, httpState); } void diff --git a/src/http.h b/src/http.h index 50bc2121d7..d7365ee624 100644 --- a/src/http.h +++ b/src/http.h @@ -1,6 +1,6 @@ /* - * $Id: http.h,v 1.13 2005/08/19 17:03:28 wessels Exp $ + * $Id: http.h,v 1.14 2005/09/28 20:26:27 wessels Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -58,7 +58,7 @@ public: int fd; http_state_flags flags; FwdState *fwd; - char *body_buf; + char *request_body_buf; off_t currentOffset; size_t read_sz; char buf[SQUID_TCP_SO_RCVBUF];