From 580a19e097f5ffdac64839946bd9e106d5dbe481 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Wed, 2 Apr 2014 22:58:06 +0900 Subject: [PATCH] nghttp2_stream_detach_deferred_data -> nghttp2_stream_resume_deferred_data --- lib/nghttp2_session.c | 8 ++++---- lib/nghttp2_stream.c | 2 +- lib/nghttp2_stream.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/nghttp2_session.c b/lib/nghttp2_session.c index 414deb7e..5d47a4f3 100644 --- a/lib/nghttp2_session.c +++ b/lib/nghttp2_session.c @@ -3083,7 +3083,7 @@ static int nghttp2_update_remote_initial_window_size_func stream->remote_window_size > 0 && arg->session->remote_window_size > 0) { - rv = nghttp2_stream_detach_deferred_data(stream, &arg->session->ob_pq); + rv = nghttp2_stream_resume_deferred_data(stream, &arg->session->ob_pq); if(nghttp2_is_fatal(rv)) { return rv; @@ -3576,7 +3576,7 @@ static int nghttp2_push_back_deferred_data_func(nghttp2_map_entry *entry, if(nghttp2_stream_check_deferred_by_flow_control(stream) && stream->remote_window_size > 0) { - rv = nghttp2_stream_detach_deferred_data(stream, &session->ob_pq); + rv = nghttp2_stream_resume_deferred_data(stream, &session->ob_pq); if(nghttp2_is_fatal(rv)) { return rv; @@ -3646,7 +3646,7 @@ static int session_on_stream_window_update_received session->remote_window_size > 0 && nghttp2_stream_check_deferred_by_flow_control(stream)) { - rv = nghttp2_stream_detach_deferred_data(stream, &session->ob_pq); + rv = nghttp2_stream_resume_deferred_data(stream, &session->ob_pq); if(nghttp2_is_fatal(rv)) { return rv; @@ -5476,7 +5476,7 @@ int nghttp2_session_resume_data(nghttp2_session *session, int32_t stream_id) return 0; } - rv = nghttp2_stream_detach_deferred_data(stream, &session->ob_pq); + rv = nghttp2_stream_resume_deferred_data(stream, &session->ob_pq); if(nghttp2_is_fatal(rv)) { return rv; diff --git a/lib/nghttp2_stream.c b/lib/nghttp2_stream.c index f9a406fe..c9883877 100644 --- a/lib/nghttp2_stream.c +++ b/lib/nghttp2_stream.c @@ -366,7 +366,7 @@ void nghttp2_stream_defer_data(nghttp2_stream *stream, uint8_t flags) stream->flags |= flags; } -int nghttp2_stream_detach_deferred_data(nghttp2_stream *stream, +int nghttp2_stream_resume_deferred_data(nghttp2_stream *stream, nghttp2_pq *pq) { assert(stream->data_item); diff --git a/lib/nghttp2_stream.h b/lib/nghttp2_stream.h index 875e0772..9fa6e56f 100644 --- a/lib/nghttp2_stream.h +++ b/lib/nghttp2_stream.h @@ -194,7 +194,7 @@ void nghttp2_stream_defer_data(nghttp2_stream *stream, uint8_t flags); * NGHTTP2_STREAM_FLAG_DEFERRED_FLOW_CONTROL are cleared if they are * set. */ -int nghttp2_stream_detach_deferred_data(nghttp2_stream *stream, +int nghttp2_stream_resume_deferred_data(nghttp2_stream *stream, nghttp2_pq *pq); /*