serf-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1709644 - in /serf/trunk: buckets/hpack_buckets.c serf_bucket_types.h
Date Tue, 20 Oct 2015 16:53:18 GMT
Author: rhuijben
Date: Tue Oct 20 16:53:18 2015
New Revision: 1709644

URL: http://svn.apache.org/viewvc?rev=1709644&view=rev
Log:
Following up on r1709643, clean up a few more lose ends in the hpack
code, to make more compilers happy.

[[Nice how scons makes Visual C++ happy with all this code, pre-patch]]

* buckets/hpack_buckets.c
  (serialize): Move declarations to the top.

* serf_bucket_types.h
  (serf_bucket_hpack_getc): Fix prototype with implementation.

Modified:
    serf/trunk/buckets/hpack_buckets.c
    serf/trunk/serf_bucket_types.h

Modified: serf/trunk/buckets/hpack_buckets.c
URL: http://svn.apache.org/viewvc/serf/trunk/buckets/hpack_buckets.c?rev=1709644&r1=1709643&r2=1709644&view=diff
==============================================================================
--- serf/trunk/buckets/hpack_buckets.c (original)
+++ serf/trunk/buckets/hpack_buckets.c Tue Oct 20 16:53:18 2015
@@ -465,12 +465,12 @@ serialize(serf_bucket_t *bucket)
   serf_hpack_context_t *ctx = bucket->data;
   serf_bucket_alloc_t *alloc = ctx->alloc;
 
-  /* Put on our aggregate bucket cloak */
-  serf_bucket_aggregate_become(bucket);
-
   serf_hpack_item_t *hi;
   serf_hpack_item_t *next;
 
+  /* Put on our aggregate bucket cloak */
+  serf_bucket_aggregate_become(bucket);
+
   for (hi = ctx->first; hi; hi = next)
     {
       char intbuf[10];
@@ -510,7 +510,7 @@ serialize(serf_bucket_t *bucket)
   return APR_SUCCESS;
 }
 
-apr_status_t
+static apr_status_t
 serf_hpack_read(serf_bucket_t *bucket,
                 apr_size_t requested,
                 const char **data,
@@ -524,7 +524,7 @@ serf_hpack_read(serf_bucket_t *bucket,
   return serf_bucket_read(bucket, requested, data, len);
 }
 
-apr_status_t
+static apr_status_t
 serf_hpack_read_iovec(serf_bucket_t *bucket,
                       apr_size_t requested,
                       int vecs_size,

Modified: serf/trunk/serf_bucket_types.h
URL: http://svn.apache.org/viewvc/serf/trunk/serf_bucket_types.h?rev=1709644&r1=1709643&r2=1709644&view=diff
==============================================================================
--- serf/trunk/serf_bucket_types.h (original)
+++ serf/trunk/serf_bucket_types.h Tue Oct 20 16:53:18 2015
@@ -833,8 +833,7 @@ void serf_bucket_hpack_setx(serf_bucket_
                             int value_copy);
 
 const char *serf_bucket_hpack_getc(serf_bucket_t *hpack_bucket,
-                                   const char *key,
-                                   apr_size_t key_len);
+                                   const char *key);
 
 /**
  * @param baton opaque baton as passed to @see serf_bucket_hpack_do



Mime
View raw message