diff options
author | Arne Schwabe | 2021-12-07 18:01:51 +0100 |
---|---|---|
committer | Gert Doering | 2021-12-07 19:50:46 +0100 |
commit | 61d2f918d53c932acd1061b8523c54c18ebb8176 (patch) | |
tree | 985e8c0416ed8209a9e9e94f082f32d9171f4b7e | |
parent | 2aef01df6ca54ca6e04923aa988b22c5df9f48f8 (diff) | |
download | openvpn-61d2f918d53c932acd1061b8523c54c18ebb8176.zip openvpn-61d2f918d53c932acd1061b8523c54c18ebb8176.tar.gz |
Remove max_size from buffer_list_new
This argument is never used apart from a unit test. Remove this
argument as a small cleanup.
Signed-off-by: Arne Schwabe <arne@rfc2549.org>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20211207170211.3275837-2-arne@rfc2549.org>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg23329.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
-rw-r--r-- | src/openvpn/buffer.c | 7 | ||||
-rw-r--r-- | src/openvpn/buffer.h | 4 | ||||
-rw-r--r-- | src/openvpn/manage.c | 4 | ||||
-rw-r--r-- | src/openvpn/ssl.c | 2 | ||||
-rw-r--r-- | tests/unit_tests/openvpn/test_buffer.c | 22 |
5 files changed, 11 insertions, 28 deletions
diff --git a/src/openvpn/buffer.c b/src/openvpn/buffer.c index 486a775..37e9e7d 100644 --- a/src/openvpn/buffer.c +++ b/src/openvpn/buffer.c @@ -1171,11 +1171,10 @@ valign4(const struct buffer *buf, const char *file, const int line) * struct buffer_list */ struct buffer_list * -buffer_list_new(const int max_size) +buffer_list_new(void) { struct buffer_list *ret; ALLOC_OBJ_CLEAR(ret, struct buffer_list); - ret->max_size = max_size; ret->size = 0; return ret; } @@ -1229,7 +1228,7 @@ struct buffer_entry * buffer_list_push_data(struct buffer_list *ol, const void *data, size_t size) { struct buffer_entry *e = NULL; - if (data && (!ol->max_size || ol->size < ol->max_size)) + if (data) { ALLOC_OBJ_CLEAR(e, struct buffer_entry); @@ -1359,7 +1358,7 @@ buffer_list_file(const char *fn, int max_line_len) char *line = (char *) malloc(max_line_len); if (line) { - bl = buffer_list_new(0); + bl = buffer_list_new(); while (fgets(line, max_line_len, fp) != NULL) { buffer_list_push(bl, line); diff --git a/src/openvpn/buffer.h b/src/openvpn/buffer.h index 8cc03c0..8017130 100644 --- a/src/openvpn/buffer.h +++ b/src/openvpn/buffer.h @@ -1102,11 +1102,9 @@ struct buffer_list /** * Allocate an empty buffer list of capacity \c max_size. * - * @param max_size the capacity of the list to allocate - * * @return the new list */ -struct buffer_list *buffer_list_new(const int max_size); +struct buffer_list *buffer_list_new(void); /** * Frees a buffer list and all the buffers in it. diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c index 28315b8..1f408f0 100644 --- a/src/openvpn/manage.c +++ b/src/openvpn/manage.c @@ -878,7 +878,7 @@ in_extra_reset(struct man_connection *mc, const int mode) } if (mode == IER_NEW) { - mc->in_extra = buffer_list_new(0); + mc->in_extra = buffer_list_new(); } } } @@ -2507,7 +2507,7 @@ man_connection_init(struct management *man) * command output from/to the socket. */ man->connection.in = command_line_new(1024); - man->connection.out = buffer_list_new(0); + man->connection.out = buffer_list_new(); /* * Initialize event set for standalone usage, when we are diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c index 3de229e..81b2a1a 100644 --- a/src/openvpn/ssl.c +++ b/src/openvpn/ssl.c @@ -3989,7 +3989,7 @@ tls_send_payload(struct tls_multi *multi, { if (!ks->paybuf) { - ks->paybuf = buffer_list_new(0); + ks->paybuf = buffer_list_new(); } buffer_list_push_data(ks->paybuf, data, (size_t)size); ret = true; diff --git a/tests/unit_tests/openvpn/test_buffer.c b/tests/unit_tests/openvpn/test_buffer.c index 5e854c2..ac70166 100644 --- a/tests/unit_tests/openvpn/test_buffer.c +++ b/tests/unit_tests/openvpn/test_buffer.c @@ -67,18 +67,18 @@ static int test_buffer_list_setup(void **state) { struct test_buffer_list_aggregate_ctx *ctx = calloc(1, sizeof(*ctx)); - ctx->empty = buffer_list_new(0); + ctx->empty = buffer_list_new(); - ctx->one_two_three = buffer_list_new(3); + ctx->one_two_three = buffer_list_new(); buffer_list_push(ctx->one_two_three, teststr1); buffer_list_push(ctx->one_two_three, teststr2); buffer_list_push(ctx->one_two_three, teststr3); - ctx->zero_length_strings = buffer_list_new(2); + ctx->zero_length_strings = buffer_list_new(); buffer_list_push(ctx->zero_length_strings, ""); buffer_list_push(ctx->zero_length_strings, ""); - ctx->empty_buffers = buffer_list_new(2); + ctx->empty_buffers = buffer_list_new(); uint8_t data = 0; buffer_list_push_data(ctx->empty_buffers, &data, 0); buffer_list_push_data(ctx->empty_buffers, &data, 0); @@ -101,17 +101,6 @@ test_buffer_list_teardown(void **state) } static void -test_buffer_list_full(void **state) -{ - struct test_buffer_list_aggregate_ctx *ctx = *state; - - /* list full */ - assert_int_equal(ctx->one_two_three->size, 3); - buffer_list_push(ctx->one_two_three, teststr4); - assert_int_equal(ctx->one_two_three->size, 3); -} - -static void test_buffer_list_aggregate_separator_empty(void **state) { struct test_buffer_list_aggregate_ctx *ctx = *state; @@ -247,9 +236,6 @@ main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test(test_buffer_strprefix), - cmocka_unit_test_setup_teardown(test_buffer_list_full, - test_buffer_list_setup, - test_buffer_list_teardown), cmocka_unit_test_setup_teardown(test_buffer_list_aggregate_separator_empty, test_buffer_list_setup, test_buffer_list_teardown), |