aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2018-12-19 13:55:53 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2018-12-19 13:55:53 +0100
commit5aa54830bf31ccd85d4ffa9be36a56adc64589f9 (patch)
tree2231ec119c922e6937ae784bf616cad3c5a6eb4f
parente3d3d2067dd535224e7a6f713107a38c3c7e18cd (diff)
downloadbusybox-w32-5aa54830bf31ccd85d4ffa9be36a56adc64589f9.tar.gz
busybox-w32-5aa54830bf31ccd85d4ffa9be36a56adc64589f9.tar.bz2
busybox-w32-5aa54830bf31ccd85d4ffa9be36a56adc64589f9.zip
bc: rename a few functions
function old new delta bc_map_find_ge - 71 +71 bc_map_find_exact - 50 +50 bc_map_index 50 - -50 bc_map_find 71 - -71 ------------------------------------------------------------------------------ (add/remove: 2/2 grow/shrink: 0/0 up/down: 121/-121) Total: 0 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--miscutils/bc.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/miscutils/bc.c b/miscutils/bc.c
index afc09a30b..dde5c354e 100644
--- a/miscutils/bc.c
+++ b/miscutils/bc.c
@@ -1199,7 +1199,7 @@ static FAST_FUNC void bc_id_free(void *id)
1199 free(((BcId *) id)->name); 1199 free(((BcId *) id)->name);
1200} 1200}
1201 1201
1202static size_t bc_map_find(const BcVec *v, const void *ptr) 1202static size_t bc_map_find_ge(const BcVec *v, const void *ptr)
1203{ 1203{
1204 size_t low = 0, high = v->len; 1204 size_t low = 0, high = v->len;
1205 1205
@@ -1221,7 +1221,7 @@ static size_t bc_map_find(const BcVec *v, const void *ptr)
1221 1221
1222static int bc_map_insert(BcVec *v, const void *ptr, size_t *i) 1222static int bc_map_insert(BcVec *v, const void *ptr, size_t *i)
1223{ 1223{
1224 size_t n = *i = bc_map_find(v, ptr); 1224 size_t n = *i = bc_map_find_ge(v, ptr);
1225 1225
1226 if (n == v->len) 1226 if (n == v->len)
1227 bc_vec_push(v, ptr); 1227 bc_vec_push(v, ptr);
@@ -1233,9 +1233,9 @@ static int bc_map_insert(BcVec *v, const void *ptr, size_t *i)
1233} 1233}
1234 1234
1235#if ENABLE_BC 1235#if ENABLE_BC
1236static size_t bc_map_index(const BcVec *v, const void *ptr) 1236static size_t bc_map_find_exact(const BcVec *v, const void *ptr)
1237{ 1237{
1238 size_t i = bc_map_find(v, ptr); 1238 size_t i = bc_map_find_ge(v, ptr);
1239 if (i >= v->len) return BC_VEC_INVALID_IDX; 1239 if (i >= v->len) return BC_VEC_INVALID_IDX;
1240 return bc_id_cmp(ptr, bc_vec_item(v, i)) ? BC_VEC_INVALID_IDX : i; 1240 return bc_id_cmp(ptr, bc_vec_item(v, i)) ? BC_VEC_INVALID_IDX : i;
1241} 1241}
@@ -3737,12 +3737,12 @@ static BC_STATUS zbc_parse_call(BcParse *p, char *name, uint8_t flags)
3737 goto err; 3737 goto err;
3738 } 3738 }
3739 3739
3740 idx = bc_map_index(&G.prog.fn_map, &entry); 3740 idx = bc_map_find_exact(&G.prog.fn_map, &entry);
3741 3741
3742 if (idx == BC_VEC_INVALID_IDX) { 3742 if (idx == BC_VEC_INVALID_IDX) {
3743 // No such function exist, create an empty one 3743 // No such function exists, create an empty one
3744 bc_parse_addFunc(p, name, &idx); 3744 bc_parse_addFunc(p, name, &idx);
3745 idx = bc_map_index(&G.prog.fn_map, &entry); 3745 idx = bc_map_find_exact(&G.prog.fn_map, &entry);
3746 } else 3746 } else
3747 free(name); 3747 free(name);
3748 3748