From d6e24bd795d5d1d00c2414efe2e5d9e1152c5f5b Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 18 Dec 2018 20:10:48 +0100 Subject: bc: simplify bc_array_expand() Signed-off-by: Denys Vlasenko --- miscutils/bc.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/miscutils/bc.c b/miscutils/bc.c index e62ca0f69..7ddae341f 100644 --- a/miscutils/bc.c +++ b/miscutils/bc.c @@ -2547,17 +2547,19 @@ static void bc_array_init(BcVec *a, bool nums) static void bc_array_expand(BcVec *a, size_t len) { - BcResultData data; - - if (a->size == sizeof(BcNum) && a->dtor == bc_num_free) { + if (a->dtor == bc_num_free + // && a->size == sizeof(BcNum) - always true + ) { + BcNum n; while (len > a->len) { - bc_num_init_DEF_SIZE(&data.n); - bc_vec_push(a, &data.n); + bc_num_init_DEF_SIZE(&n); + bc_vec_push(a, &n); } } else { + BcVec v; while (len > a->len) { - bc_array_init(&data.v, true); - bc_vec_push(a, &data.v); + bc_array_init(&v, true); + bc_vec_push(a, &v); } } } -- cgit v1.2.3