dovecot-2.2: lib-http: Moved struct http_response* to http-respo...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/c5952dd642c6
changeset: 16603:c5952dd642c6
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Jul 11 12:54:02 2013 +0300
description:
lib-http: Moved struct http_response* to http-response.h
Also http-client.h now #includes only http-response.h

diffstat:

 src/lib-http/Makefile.am            |   1 +
 src/lib-http/http-client.h          |   2 +-
 src/lib-http/http-response-parser.h |  23 +----------------------
 src/lib-http/http-response.h        |  28 ++++++++++++++++++++++++++++
 4 files changed, 31 insertions(+), 23 deletions(-)

diffs (88 lines):

diff -r 69cc86583da2 -r c5952dd642c6 src/lib-http/Makefile.am
--- a/src/lib-http/Makefile.am	Thu Jul 11 10:25:32 2013 +0300
+++ b/src/lib-http/Makefile.am	Thu Jul 11 12:54:02 2013 +0300
@@ -25,6 +25,7 @@
 	http-parser.h \
 	http-header-parser.h \
 	http-transfer.h \
+	http-response.h \
 	http-response-parser.h \
 	http-client-private.h \
 	http-client.h
diff -r 69cc86583da2 -r c5952dd642c6 src/lib-http/http-client.h
--- a/src/lib-http/http-client.h	Thu Jul 11 10:25:32 2013 +0300
+++ b/src/lib-http/http-client.h	Thu Jul 11 12:54:02 2013 +0300
@@ -1,7 +1,7 @@
 #ifndef HTTP_CLIENT_H
 #define HTTP_CLIENT_H
 
-#include "http-response-parser.h"
+#include "http-response.h"
 
 struct http_response;
 
diff -r 69cc86583da2 -r c5952dd642c6 src/lib-http/http-response-parser.h
--- a/src/lib-http/http-response-parser.h	Thu Jul 11 10:25:32 2013 +0300
+++ b/src/lib-http/http-response-parser.h	Thu Jul 11 12:54:02 2013 +0300
@@ -1,28 +1,7 @@
 #ifndef HTTP_RESPONSE_PARSER_H
 #define HTTP_RESPONSE_PARSER_H
 
-struct http_response_header {
-	const char *key;
-	const char *value;
-	size_t size;
-};
-
-struct http_response {
-	unsigned char version_major;
-	unsigned char version_minor;
-
-	unsigned int status;
-
-	const char *reason;
-	const char *location;
-
-	time_t date;
-	struct istream *payload;
-
-	ARRAY(struct http_response_header) headers;
-
-	unsigned int connection_close:1;
-};
+#include "http-response.h"
 
 struct http_response_parser;
 
diff -r 69cc86583da2 -r c5952dd642c6 src/lib-http/http-response.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/lib-http/http-response.h	Thu Jul 11 12:54:02 2013 +0300
@@ -0,0 +1,28 @@
+#ifndef HTTP_RESPONSE_H
+#define HTTP_RESPONSE_H
+
+struct http_response_header {
+	const char *key;
+	const char *value;
+	size_t size;
+};
+ARRAY_DEFINE_TYPE(http_response_header, struct http_response_header);
+
+struct http_response {
+	unsigned char version_major;
+	unsigned char version_minor;
+
+	unsigned int status;
+
+	const char *reason;
+	const char *location;
+
+	time_t date;
+	struct istream *payload;
+
+	ARRAY_TYPE(http_response_header) headers;
+
+	unsigned int connection_close:1;
+};
+
+#endif