serf-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1711822 - in /serf/trunk/protocols: http2_buckets.h http2_protocol.c http2_stream.c
Date Sun, 01 Nov 2015 16:08:40 GMT
Author: rhuijben
Date: Sun Nov  1 16:08:39 2015
New Revision: 1711822

URL: http://svn.apache.org/viewvc?rev=1711822&view=rev
Log:
Resolve some warnings found by compiling using clang on FreeBSD.

* protocols/http2_buckets.h
  (serf_hpack_table_t): Remove duplicated definition.

* protocols/http2_protocol.c
  (serf_http2__allocate_stream_id): Return void to match callback signature.

* protocols/http2_stream.c
  (stream_response_eof,
   stream_setup_response): Mark static.

Modified:
    serf/trunk/protocols/http2_buckets.h
    serf/trunk/protocols/http2_protocol.c
    serf/trunk/protocols/http2_stream.c

Modified: serf/trunk/protocols/http2_buckets.h
URL: http://svn.apache.org/viewvc/serf/trunk/protocols/http2_buckets.h?rev=1711822&r1=1711821&r2=1711822&view=diff
==============================================================================
--- serf/trunk/protocols/http2_buckets.h (original)
+++ serf/trunk/protocols/http2_buckets.h Sun Nov  1 16:08:39 2015
@@ -92,8 +92,6 @@ serf__bucket_http2_unpad_create(serf_buc
 extern const serf_bucket_type_t serf_bucket_type__hpack;
 #define SERF_BUCKET_IS_HPACK(b) SERF_BUCKET_CHECK((b), _hpack)
 
-typedef struct serf_hpack_table_t serf_hpack_table_t;
-
 serf_bucket_t *
 serf__bucket_hpack_create(serf_hpack_table_t *hpack_table,
                           serf_bucket_alloc_t *allocator);

Modified: serf/trunk/protocols/http2_protocol.c
URL: http://svn.apache.org/viewvc/serf/trunk/protocols/http2_protocol.c?rev=1711822&r1=1711821&r2=1711822&view=diff
==============================================================================
--- serf/trunk/protocols/http2_protocol.c (original)
+++ serf/trunk/protocols/http2_protocol.c Sun Nov  1 16:08:39 2015
@@ -1387,12 +1387,14 @@ http2_protocol_teardown(serf_connection_
   conn->protocol_baton = NULL;
 }
 
-apr_int32_t
+void
 serf_http2__allocate_stream_id(void *baton,
                                apr_int32_t *streamid)
 {
   serf_http2_stream_t *stream = baton;
 
+  SERF_H2_assert(streamid == &stream->streamid);
+
   /* Do we need to assign a new id?
 
      We do this when converting the frame to on-wire data, to avoid
@@ -1407,8 +1409,6 @@ serf_http2__allocate_stream_id(void *bat
       if (stream->status == H2S_INIT)
         stream->status = H2S_IDLE;
     }
-
-  return stream->streamid;
 }
 
 static void

Modified: serf/trunk/protocols/http2_stream.c
URL: http://svn.apache.org/viewvc/serf/trunk/protocols/http2_stream.c?rev=1711822&r1=1711821&r2=1711822&view=diff
==============================================================================
--- serf/trunk/protocols/http2_stream.c (original)
+++ serf/trunk/protocols/http2_stream.c Sun Nov  1 16:08:39 2015
@@ -165,7 +165,7 @@ serf_http2__stream_reset(serf_http2_stre
   return APR_SUCCESS;
 }
 
-apr_status_t
+static apr_status_t
 stream_response_eof(void *baton,
                     serf_bucket_t *aggregate_bucket)
 {
@@ -181,7 +181,7 @@ stream_response_eof(void *baton,
     }
 }
 
-void
+static void
 stream_setup_response(serf_http2_stream_t *stream,
                       serf_config_t *config)
 {



Mime
View raw message