httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jaillet...@apache.org
Subject svn commit: r1720647 - in /httpd/httpd/trunk/modules/http2: h2_conn_io.c h2_h2.c h2_mplx.c h2_session.c h2_switch.c h2_task.c h2_task_queue.c h2_util.c h2_workers.c
Date Thu, 17 Dec 2015 20:41:29 GMT
Author: jailletc36
Date: Thu Dec 17 20:41:29 2015
New Revision: 1720647

URL: http://svn.apache.org/viewvc?rev=1720647&view=rev
Log:
Fix some small style issues (extra blank lines, '{' at the end of function declaration)

Modified:
    httpd/httpd/trunk/modules/http2/h2_conn_io.c
    httpd/httpd/trunk/modules/http2/h2_h2.c
    httpd/httpd/trunk/modules/http2/h2_mplx.c
    httpd/httpd/trunk/modules/http2/h2_session.c
    httpd/httpd/trunk/modules/http2/h2_switch.c
    httpd/httpd/trunk/modules/http2/h2_task.c
    httpd/httpd/trunk/modules/http2/h2_task_queue.c
    httpd/httpd/trunk/modules/http2/h2_util.c
    httpd/httpd/trunk/modules/http2/h2_workers.c

Modified: httpd/httpd/trunk/modules/http2/h2_conn_io.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_conn_io.c?rev=1720647&r1=1720646&r2=1720647&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_conn_io.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_conn_io.c Thu Dec 17 20:41:29 2015
@@ -122,7 +122,8 @@ static apr_status_t pass_out(apr_bucket_
 /* Bring the current buffer content into the output brigade, appropriately
  * chunked.
  */
-static apr_status_t bucketeer_buffer(h2_conn_io *io) {
+static apr_status_t bucketeer_buffer(h2_conn_io *io)
+{
     const char *data = io->buffer;
     apr_size_t remaining = io->buflen;
     apr_bucket *b;

Modified: httpd/httpd/trunk/modules/http2/h2_h2.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_h2.c?rev=1720647&r1=1720646&r2=1720647&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_h2.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_h2.c Thu Dec 17 20:41:29 2015
@@ -699,6 +699,3 @@ static int h2_h2_post_read_req(request_r
     }
     return DECLINED;
 }
-
-
-

Modified: httpd/httpd/trunk/modules/http2/h2_mplx.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_mplx.c?rev=1720647&r1=1720646&r2=1720647&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_mplx.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_mplx.c Thu Dec 17 20:41:29 2015
@@ -59,7 +59,8 @@
     } while(0)
 
 
-static int is_aborted(h2_mplx *m, apr_status_t *pstatus) {
+static int is_aborted(h2_mplx *m, apr_status_t *pstatus)
+{
     AP_DEBUG_ASSERT(m);
     if (m->aborted) {
         *pstatus = APR_ECONNABORTED;
@@ -175,7 +176,8 @@ void h2_mplx_release(h2_mplx *m)
     release(m, 1);
 }
 
-static void workers_register(h2_mplx *m) {
+static void workers_register(h2_mplx *m)
+{
     /* Initially, there was ref count increase for this as well, but
      * this is not needed, even harmful.
      * h2_workers is only a hub for all the h2_worker instances.
@@ -190,11 +192,13 @@ static void workers_register(h2_mplx *m)
     h2_workers_register(m->workers, m);
 }
 
-static void workers_unregister(h2_mplx *m) {
+static void workers_unregister(h2_mplx *m)
+{
     h2_workers_unregister(m->workers, m);
 }
 
-static int io_process_events(h2_mplx *m, h2_io *io) {
+static int io_process_events(h2_mplx *m, h2_io *io)
+{
     if (io->input_consumed && m->input_consumed) {
         m->input_consumed(m->input_consumed_ctx, 
                           io->id, io->input_consumed);
@@ -204,7 +208,6 @@ static int io_process_events(h2_mplx *m,
     return 0;
 }
 
-
 static void io_destroy(h2_mplx *m, h2_io *io, int events)
 {
     apr_pool_t *pool = io->pool;
@@ -253,7 +256,8 @@ static int io_stream_done(h2_mplx *m, h2
     }
 }
 
-static int stream_done_iter(void *ctx, h2_io *io) {
+static int stream_done_iter(void *ctx, h2_io *io)
+{
     return io_stream_done((h2_mplx*)ctx, io, 0);
 }
 
@@ -685,7 +689,6 @@ apr_status_t h2_mplx_out_open(h2_mplx *m
     return status;
 }
 
-
 apr_status_t h2_mplx_out_write(h2_mplx *m, int stream_id, 
                                ap_filter_t* f, apr_bucket_brigade *bb,
                                apr_table_t *trailers,

Modified: httpd/httpd/trunk/modules/http2/h2_session.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_session.c?rev=1720647&r1=1720646&r2=1720647&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_session.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_session.c Thu Dec 17 20:41:29 2015
@@ -1017,7 +1017,8 @@ typedef struct {
     int resume_count;
 } resume_ctx;
 
-static int resume_on_data(void *ctx, h2_stream *stream) {
+static int resume_on_data(void *ctx, h2_stream *stream)
+{
     resume_ctx *rctx = (resume_ctx*)ctx;
     h2_session *session = rctx->session;
     AP_DEBUG_ASSERT(session);
@@ -1040,7 +1041,8 @@ static int resume_on_data(void *ctx, h2_
     return 1;
 }
 
-static int h2_session_resume_streams_with_data(h2_session *session) {
+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) {
@@ -1579,11 +1581,8 @@ apr_status_t h2_session_receive(h2_sessi
     return APR_SUCCESS;
 }
 
-
-
 static apr_status_t h2_session_read(h2_session *session, int block)
 {
-    
     while (1) {
         apr_status_t status;
         

Modified: httpd/httpd/trunk/modules/http2/h2_switch.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_switch.c?rev=1720647&r1=1720646&r2=1720647&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_switch.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_switch.c Thu Dec 17 20:41:29 2015
@@ -182,4 +182,3 @@ void h2_switch_register_hooks(void)
     ap_hook_protocol_switch(h2_protocol_switch, NULL, NULL, APR_HOOK_MIDDLE);
     ap_hook_protocol_get(h2_protocol_get, NULL, NULL, APR_HOOK_MIDDLE);
 }
-

Modified: httpd/httpd/trunk/modules/http2/h2_task.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_task.c?rev=1720647&r1=1720646&r2=1720647&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_task.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_task.c Thu Dec 17 20:41:29 2015
@@ -52,7 +52,8 @@ static apr_status_t h2_filter_stream_inp
                                            apr_bucket_brigade* brigade,
                                            ap_input_mode_t mode,
                                            apr_read_type_e block,
-                                           apr_off_t readbytes) {
+                                           apr_off_t readbytes)
+{
     h2_task *task = filter->ctx;
     AP_DEBUG_ASSERT(task);
     if (!task->input) {
@@ -63,7 +64,8 @@ static apr_status_t h2_filter_stream_inp
 }
 
 static apr_status_t h2_filter_stream_output(ap_filter_t* filter,
-                                            apr_bucket_brigade* brigade) {
+                                            apr_bucket_brigade* brigade)
+{
     h2_task *task = filter->ctx;
     AP_DEBUG_ASSERT(task);
     if (!task->output) {
@@ -73,7 +75,8 @@ static apr_status_t h2_filter_stream_out
 }
 
 static apr_status_t h2_filter_read_response(ap_filter_t* f,
-                                            apr_bucket_brigade* bb) {
+                                            apr_bucket_brigade* bb)
+{
     h2_task *task = f->ctx;
     AP_DEBUG_ASSERT(task);
     if (!task->output || !task->output->from_h1) {
@@ -117,7 +120,6 @@ void h2_task_register_hooks(void)
 
 static int h2_task_pre_conn(conn_rec* c, void *arg)
 {
-    
     h2_ctx *ctx;
     
     if (!c->master) {
@@ -270,8 +272,3 @@ static int h2_task_process_conn(conn_rec
     }
     return DECLINED;
 }
-
-
-
-
-

Modified: httpd/httpd/trunk/modules/http2/h2_task_queue.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_task_queue.c?rev=1720647&r1=1720646&r2=1720647&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_task_queue.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_task_queue.c Thu Dec 17 20:41:29 2015
@@ -176,6 +176,3 @@ static int tq_bubble_down(h2_task_queue
     }
     return i;
 }
-
-
-

Modified: httpd/httpd/trunk/modules/http2/h2_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_util.c?rev=1720647&r1=1720646&r2=1720647&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_util.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_util.c Thu Dec 17 20:41:29 2015
@@ -475,7 +475,8 @@ apr_status_t h2_util_copy(apr_bucket_bri
     return status;
 }
 
-int h2_util_has_flush_or_eos(apr_bucket_brigade *bb) {
+int h2_util_has_flush_or_eos(apr_bucket_brigade *bb)
+{
     apr_bucket *b;
     for (b = APR_BRIGADE_FIRST(bb);
          b != APR_BRIGADE_SENTINEL(bb);

Modified: httpd/httpd/trunk/modules/http2/h2_workers.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_workers.c?rev=1720647&r1=1720646&r2=1720647&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_workers.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_workers.c Thu Dec 17 20:41:29 2015
@@ -43,7 +43,8 @@ static int in_list(h2_workers *workers,
     return 0;
 }
 
-static void cleanup_zombies(h2_workers *workers, int lock) {
+static void cleanup_zombies(h2_workers *workers, int lock)
+{
     if (lock) {
         apr_thread_mutex_lock(workers->lock);
     }
@@ -59,7 +60,6 @@ static void cleanup_zombies(h2_workers *
     }
 }
 
-
 /**
  * Get the next task for the given worker. Will block until a task arrives
  * or the max_wait timer expires and more than min workers exist.
@@ -216,7 +216,6 @@ static void worker_done(h2_worker *worke
     }
 }
 
-
 static apr_status_t add_worker(h2_workers *workers)
 {
     h2_worker *w = h2_worker_create(workers->next_worker_id++,
@@ -232,7 +231,8 @@ static apr_status_t add_worker(h2_worker
     return APR_SUCCESS;
 }
 
-static apr_status_t h2_workers_start(h2_workers *workers) {
+static apr_status_t h2_workers_start(h2_workers *workers)
+{
     apr_status_t status = apr_thread_mutex_lock(workers->lock);
     if (status == APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, workers->s,
@@ -390,4 +390,3 @@ void h2_workers_set_max_idle_secs(h2_wor
     }
     apr_atomic_set32(&workers->max_idle_secs, idle_secs);
 }
-



Mime
View raw message