MINOR: shctx: Remove explicit 'from' param from shctx_row_data_append

This parameter is not necessary since the first element of a row always
has a pointer to the row's tail.

diff --git a/include/haproxy/shctx.h b/include/haproxy/shctx.h
index c9715aa1eb5302f5f921061d7e4f3cab738afecf..8b1e56069804bd073692ec3eb6824f39251148a7 100644 (file)
--- a/include/haproxy/shctx.h
+++ b/include/haproxy/shctx.h
@@ -27,7 +27,7 @@ struct shared_block *shctx_row_reserve_hot(struct shared_context *shctx,
 void shctx_row_inc_hot(struct shared_context *shctx, struct shared_block *first);
 void shctx_row_dec_hot(struct shared_context *shctx, struct shared_block *first);
 int shctx_row_data_append(struct shared_context *shctx,
-                          struct shared_block *first, struct shared_block *from,
+                          struct shared_block *first,
                           unsigned char *data, int len);
 int shctx_row_data_get(struct shared_context *shctx, struct shared_block *first,
                        unsigned char *dst, int offset, int len);

diff --git a/src/cache.c b/src/cache.c
index eab3f975200e6c88037e133903d85905716a6b96..93275f59d5c4f05c51016c11944ce5f583f41ab2 100644 (file)
--- a/src/cache.c
+++ b/src/cache.c
@@ -682,7 +682,7 @@ cache_store_http_payload(struct stream *s, struct filter *filter, struct http_ms
        }
        shctx_unlock(shctx);
 
-       ret = shctx_row_data_append(shctx, st->first_block, st->first_block->last_append,
+       ret = shctx_row_data_append(shctx, st->first_block,
                                    (unsigned char *)b_head(&trash), b_data(&trash));
        if (ret < 0)
                goto no_cache;
@@ -1240,7 +1240,7 @@ enum act_return http_action_store_cache(struct act_rule *rule, struct proxy *px,
         */
        /* does not need to be locked because it's in the "hot" list,
         * copy the headers */
-       if (shctx_row_data_append(shctx, first, NULL, (unsigned char *)trash.area, trash.data) < 0)
+       if (shctx_row_data_append(shctx, first, (unsigned char *)trash.area, trash.data) < 0)
                goto out;
 
        /* register the buffer in the filter ctx for filling it with data*/

diff --git a/src/shctx.c b/src/shctx.c
index 604c343a9c79df3eafa87bf14f92bec2d5d88dae..dd45ad217ec0e83ff1371d292263ff4d4ce592bd 100644 (file)
--- a/src/shctx.c
+++ b/src/shctx.c
@@ -167,8 +167,7 @@ void shctx_row_dec_hot(struct shared_context *shctx, struct shared_block *first)
  * Return the amount of appended data if ret >= 0
  * or how much more space it needs to contains the data if < 0.
  */
-int shctx_row_data_append(struct shared_context *shctx,
-                          struct shared_block *first, struct shared_block *from,
+int shctx_row_data_append(struct shared_context *shctx, struct shared_block *first,
                           unsigned char *data, int len)
 {
        int remain, start;
@@ -178,7 +177,7 @@ int shctx_row_data_append(struct shared_context *shctx,
        if (len > first->block_count * shctx->block_size - first->len)
                return (first->block_count * shctx->block_size - first->len) - len;
 
-       block = from ? from : first;
+       block = first->last_append ? first->last_append : first;
        list_for_each_entry_from(block, &shctx->hot, list) {
                /* end of copy */
                if (len <= 0)

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index d025d6eaeee5c1eb9301269d41ec6ea50fc61366..2334b86db30b0d9e1448124ee98aba157bba718b 100644 (file)
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -4260,7 +4260,7 @@ static int sh_ssl_sess_store(unsigned char *s_id, unsigned char *data, int data_
                first->len = sizeof(struct sh_ssl_sess_hdr);
        }
 
-       if (shctx_row_data_append(ssl_shctx, first, NULL, data, data_len) < 0) {
+       if (shctx_row_data_append(ssl_shctx, first, data, data_len) < 0) {
                shctx_row_dec_hot(ssl_shctx, first);
                return 0;
        }