Applied patch by normw@gknw.net for ANSI C compliance.

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

diff --git a/modules/http2/h2_mplx.c b/modules/http2/h2_mplx.c
index 49656abbca016eabbd3dc478f52269c8725e825d..c04b05e7729bd90d23f6205dd2af1c1c985ab915 100644 (file)
--- a/modules/http2/h2_mplx.c
+++ b/modules/http2/h2_mplx.c
@@ -436,7 +436,12 @@ apr_status_t h2_mplx_in_update_windows(h2_mplx *m,
     }
     status = apr_thread_mutex_lock(m->lock);
     if (APR_SUCCESS == status) {
-        update_ctx ctx = { cb, cb_ctx, 0 };
+        update_ctx ctx;
+        
+        ctx.cb              = cb;
+        ctx.cb_ctx          = cb_ctx;
+        ctx.streams_updated = 0;
+
         status = APR_EAGAIN;
         h2_io_set_iter(m->stream_ios, update_window, &ctx);
         

diff --git a/modules/http2/h2_response.c b/modules/http2/h2_response.c
index b464472c56152a16a77ada0f478ccc1af10c2450..502b376ef4b626b7e6fa9e62439cc90fbf70b8a9 100644 (file)
--- a/modules/http2/h2_response.c
+++ b/modules/http2/h2_response.c
@@ -202,7 +202,14 @@ static h2_ngheader *make_ngheader(apr_pool_t *pool, const char *status,
 {
     size_t n;
     h2_ngheader *h;
-    nvctx_t ctx = { NULL, 1, strlen(status) + 1, 0, NULL, pool };
+    nvctx_t ctx;
+    
+    ctx.nv       = NULL;
+    ctx.nvlen    = 1;
+    ctx.nvstrlen = strlen(status) + 1;
+    ctx.offset   = 0;
+    ctx.strbuf   = NULL;
+    ctx.pool     = pool;
     
     apr_table_do(count_header, &ctx, header, NULL);
     

diff --git a/modules/http2/h2_session.c b/modules/http2/h2_session.c
index b894fee5bafb940c5424d1460294e9a5b20a54e1..5b46838d94dd46145916ed9ebdc1a84d748c6cbb 100644 (file)
--- a/modules/http2/h2_session.c
+++ b/modules/http2/h2_session.c
@@ -852,7 +852,11 @@ static int h2_session_resume_streams_with_data(h2_session *session) {
     AP_DEBUG_ASSERT(session);
     if (!h2_stream_set_is_empty(session->streams)
         && session->mplx && !session->aborted) {
-        resume_ctx ctx = { session, 0 };
+        resume_ctx ctx;
+        
+        ctx.session      = session;
+        ctx.resume_count = 0;
+
         /* Resume all streams where we have data in the out queue and
          * which had been suspended before. */
         h2_stream_set_iter(session->streams, resume_on_data, &ctx);