From 4768243d0c51213ff69236a2e6c2e40eb60d767b Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Mon, 26 May 2008 10:40:43 +0300
Subject: [PATCH] 1008: rename http_read_post_data to read_http_post

---
 src/protocol/file/cgi.c  |  2 +-
 src/protocol/http/http.c | 24 ++++++++++++------------
 src/protocol/http/http.h |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/protocol/file/cgi.c b/src/protocol/file/cgi.c
index bd114970f..df82e0895 100644
--- a/src/protocol/file/cgi.c
+++ b/src/protocol/file/cgi.c
@@ -91,7 +91,7 @@ send_more_post_data(struct socket *socket)
 	unsigned char buffer[POST_BUFFER_SIZE];
 	int got;
 
-	got = http_read_post_data(&http->post, buffer, POST_BUFFER_SIZE);
+	got = read_http_post(&http->post, buffer, POST_BUFFER_SIZE);
 	if (got < 0) {
 		abort_connection(conn, -errno);
 	} else if (got > 0) {
diff --git a/src/protocol/http/http.c b/src/protocol/http/http.c
index 7584b64a6..29b1e49d4 100644
--- a/src/protocol/http/http.c
+++ b/src/protocol/http/http.c
@@ -664,8 +664,8 @@ post_length(unsigned char *post_data, unsigned int *count)
 
 /** @relates http_post */
 static int
-http_read_post_data_inline(struct http_post *http_post,
-			   unsigned char buffer[], int max)
+read_http_post_inline(struct http_post *http_post,
+		      unsigned char buffer[], int max)
 {
 	unsigned char *post = http_post->post_data;
 	unsigned char *end = strchr(post, FILE_CHAR);
@@ -715,8 +715,8 @@ http_read_post_data_inline(struct http_post *http_post,
 
 /** @relates http_post */
 static int
-http_read_post_data_fd(struct http_post *http_post,
-		       unsigned char buffer[], int max)
+read_http_post_fd(struct http_post *http_post,
+		  unsigned char buffer[], int max)
 {
 	int ret;
 
@@ -745,8 +745,8 @@ http_read_post_data_fd(struct http_post *http_post,
  *
  * @relates http_post */
 int
-http_read_post_data(struct http_post *http_post,
-		    unsigned char buffer[], int max)
+read_http_post(struct http_post *http_post,
+	       unsigned char buffer[], int max)
 {
 	int total = 0;
 
@@ -755,13 +755,13 @@ http_read_post_data(struct http_post *http_post,
 		int post_fd = http_post->post_fd;
 
 		if (post_fd < 0)
-			chunk = http_read_post_data_inline(http_post,
-							   buffer + total,
-							   max - total);
+			chunk = read_http_post_inline(http_post,
+						      buffer + total,
+						      max - total);
 		else
-			chunk = http_read_post_data_fd(http_post,
-						       buffer + total,
-						       max - total);
+			chunk = read_http_post_fd(http_post,
+						  buffer + total,
+						  max - total);
 		/* Be careful not to change errno here.  */
 
 		if (chunk == 0 && http_post->post_fd == post_fd)
diff --git a/src/protocol/http/http.h b/src/protocol/http/http.h
index ba1491425..36485b8a0 100644
--- a/src/protocol/http/http.h
+++ b/src/protocol/http/http.h
@@ -38,8 +38,8 @@ struct http_post {
 
 void init_http_post(struct http_post *http_post);
 void done_http_post(struct http_post *http_post);
-int http_read_post_data(struct http_post *http_post,
-			unsigned char buffer[], int max);
+int read_http_post(struct http_post *http_post,
+		   unsigned char buffer[], int max);
 
 /** connection.info points to this in HTTP and local CGI connections. */
 struct http_connection_info {