mirror of
https://github.com/OpenVPN/openvpn.git
synced 2024-09-20 03:52:28 +02:00
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>
This commit is contained in:
parent
2aef01df6c
commit
61d2f918d5
@ -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);
|
||||
|
@ -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.
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
|
@ -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);
|
||||
@ -100,17 +100,6 @@ test_buffer_list_teardown(void **state)
|
||||
return 0;
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
@ -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),
|
||||
|
Loading…
Reference in New Issue
Block a user