httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ic...@apache.org
Subject svn commit: r1712514 - in /httpd/httpd/trunk/modules/http2: h2_bucket_eoc.c h2_bucket_eoc.h h2_bucket_eos.c h2_bucket_eos.h
Date Wed, 04 Nov 2015 09:01:45 GMT
Author: icing
Date: Wed Nov  4 09:01:45 2015
New Revision: 1712514

URL: http://svn.apache.org/viewvc?rev=1712514&view=rev
Log:
removing copy+paste, unwanted AP_DECLAREs and renamed bucket type to have h2_ prefix

Modified:
    httpd/httpd/trunk/modules/http2/h2_bucket_eoc.c
    httpd/httpd/trunk/modules/http2/h2_bucket_eoc.h
    httpd/httpd/trunk/modules/http2/h2_bucket_eos.c
    httpd/httpd/trunk/modules/http2/h2_bucket_eos.h

Modified: httpd/httpd/trunk/modules/http2/h2_bucket_eoc.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_bucket_eoc.c?rev=1712514&r1=1712513&r2=1712514&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_bucket_eoc.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_bucket_eoc.c Wed Nov  4 09:01:45 2015
@@ -54,8 +54,7 @@ static apr_status_t bucket_read(apr_buck
     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_m
     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,

Modified: httpd/httpd/trunk/modules/http2/h2_bucket_eoc.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_bucket_eoc.h?rev=1712514&r1=1712513&r2=1712514&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_bucket_eoc.h (original)
+++ httpd/httpd/trunk/modules/http2/h2_bucket_eoc.h Wed Nov  4 09:01:45 2015
@@ -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 */

Modified: httpd/httpd/trunk/modules/http2/h2_bucket_eos.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_bucket_eos.c?rev=1712514&r1=1712513&r2=1712514&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_bucket_eos.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_bucket_eos.c Wed Nov  4 09:01:45 2015
@@ -54,8 +54,7 @@ static apr_status_t bucket_read(apr_buck
     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_m
     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,

Modified: httpd/httpd/trunk/modules/http2/h2_bucket_eos.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_bucket_eos.h?rev=1712514&r1=1712513&r2=1712514&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_bucket_eos.h (original)
+++ httpd/httpd/trunk/modules/http2/h2_bucket_eos.h Wed Nov  4 09:01:45 2015
@@ -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 */



Mime
View raw message