removing copy+paste, unwanted AP_DECLAREs and renamed bucket type to have h2_ prefix

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1712514 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/http2/h2_bucket_eoc.c b/modules/http2/h2_bucket_eoc.c
index 130a9ebf34aff30d841c2847a57ce127d9131d69..eccc067805366e2a7206b880332c59adc3663e5b 100644 (file)
--- a/modules/http2/h2_bucket_eoc.c
+++ b/modules/http2/h2_bucket_eoc.c
@@ -54,8 +54,7 @@ static apr_status_t bucket_read(apr_bucket *b, const char **str,
     return APR_SUCCESS;
 }
 
-AP_DECLARE(apr_bucket *) h2_bucket_eoc_make(apr_bucket *b, 
-                                            h2_session *session)
+apr_bucket * h2_bucket_eoc_make(apr_bucket *b, h2_session *session)
 {
     h2_bucket_eoc *h;
 
@@ -63,13 +62,12 @@ AP_DECLARE(apr_bucket *) h2_bucket_eoc_make(apr_bucket *b,
     h->session = session;
 
     b = apr_bucket_shared_make(b, h, 0, 0);
-    b->type = &ap_bucket_type_h2_eoc;
+    b->type = &h2_bucket_type_eoc;
     
     return b;
 }
 
-AP_DECLARE(apr_bucket *) h2_bucket_eoc_create(apr_bucket_alloc_t *list,
-                                              h2_session *session)
+apr_bucket * h2_bucket_eoc_create(apr_bucket_alloc_t *list, h2_session *session)
 {
     apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
 
@@ -97,7 +95,7 @@ static void bucket_destroy(void *data)
     }
 }
 
-AP_DECLARE_DATA const apr_bucket_type_t ap_bucket_type_h2_eoc = {
+const apr_bucket_type_t h2_bucket_type_eoc = {
     "H2EOC", 5, APR_BUCKET_METADATA,
     bucket_destroy,
     bucket_read,

diff --git a/modules/http2/h2_bucket_eoc.h b/modules/http2/h2_bucket_eoc.h
index b8a62158a1cb3de8953d18f933c1da56b701997e..f1cd6f813547cbb26c6340179c621e0dd8e1d229 100644 (file)
--- a/modules/http2/h2_bucket_eoc.h
+++ b/modules/http2/h2_bucket_eoc.h
@@ -19,13 +19,13 @@
 struct h2_session;
 
 /** End Of HTTP/2 SESSION (H2EOC) bucket */
-AP_DECLARE_DATA extern const apr_bucket_type_t ap_bucket_type_h2_eoc;
+extern const apr_bucket_type_t h2_bucket_type_eoc;
 
 
-AP_DECLARE(apr_bucket *) h2_bucket_eoc_make(apr_bucket *b, 
-                                            struct h2_session *session);
+apr_bucket * h2_bucket_eoc_make(apr_bucket *b, 
+                                struct h2_session *session);
 
-AP_DECLARE(apr_bucket *) h2_bucket_eoc_create(apr_bucket_alloc_t *list,
-                                              struct h2_session *session);
+apr_bucket * h2_bucket_eoc_create(apr_bucket_alloc_t *list,
+                                  struct h2_session *session);
 
 #endif /* mod_http2_h2_bucket_eoc_h */

diff --git a/modules/http2/h2_bucket_eos.c b/modules/http2/h2_bucket_eos.c
index b74754059ce965016b63497cc5699af218f039b6..73ef58b5fcdd7656ee45adcbdf803ed90e674cdb 100644 (file)
--- a/modules/http2/h2_bucket_eos.c
+++ b/modules/http2/h2_bucket_eos.c
@@ -54,8 +54,7 @@ static apr_status_t bucket_read(apr_bucket *b, const char **str,
     return APR_SUCCESS;
 }
 
-AP_DECLARE(apr_bucket *) h2_bucket_eos_make(apr_bucket *b, 
-                                                   h2_stream *stream)
+apr_bucket *h2_bucket_eos_make(apr_bucket *b, h2_stream *stream)
 {
     h2_bucket_eos *h;
 
@@ -63,13 +62,13 @@ AP_DECLARE(apr_bucket *) h2_bucket_eos_make(apr_bucket *b,
     h->stream = stream;
 
     b = apr_bucket_shared_make(b, h, 0, 0);
-    b->type = &ap_bucket_type_h2_eos;
+    b->type = &h2_bucket_type_eos;
     
     return b;
 }
 
-AP_DECLARE(apr_bucket *) h2_bucket_eos_create(apr_bucket_alloc_t *list,
-                                                     h2_stream *stream)
+apr_bucket *h2_bucket_eos_create(apr_bucket_alloc_t *list,
+                                 h2_stream *stream)
 {
     apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
 
@@ -97,7 +96,7 @@ static void bucket_destroy(void *data)
     }
 }
 
-AP_DECLARE_DATA const apr_bucket_type_t ap_bucket_type_h2_eos = {
+AP_DECLARE_DATA const apr_bucket_type_t h2_bucket_type_eos = {
     "H2EOS", 5, APR_BUCKET_METADATA,
     bucket_destroy,
     bucket_read,

diff --git a/modules/http2/h2_bucket_eos.h b/modules/http2/h2_bucket_eos.h
index e7ab871d15671c9a724237df9f654bd38ac2f287..bd3360db5a53bc52aa7b2f307dd60d84e5428154 100644 (file)
--- a/modules/http2/h2_bucket_eos.h
+++ b/modules/http2/h2_bucket_eos.h
@@ -19,13 +19,12 @@
 struct h2_stream;
 
 /** End Of HTTP/2 STREAM (H2EOS) bucket */
-AP_DECLARE_DATA extern const apr_bucket_type_t ap_bucket_type_h2_eos;
+extern const apr_bucket_type_t h2_bucket_type_eos;
 
 
-AP_DECLARE(apr_bucket *) h2_bucket_eos_make(apr_bucket *b, 
-                                            struct h2_stream *stream);
+apr_bucket *h2_bucket_eos_make(apr_bucket *b, struct h2_stream *stream);
 
-AP_DECLARE(apr_bucket *) h2_bucket_eos_create(apr_bucket_alloc_t *list,
-                                              struct h2_stream *stream);
+apr_bucket *h2_bucket_eos_create(apr_bucket_alloc_t *list, 
+                                 struct h2_stream *stream);
 
 #endif /* mod_http2_h2_bucket_stream_eos_h */