emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bc: rewrite more for() loops

Browse Source 
function                                             old     new   delta
bc_program_name                                       75      67      -8

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2018-12-18 12:55:40 +01:00
parent 71c82d1d8c
commit 6b0fbd14fc
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
miscutils/bc.c
View File

@ -2064,7 +2064,7 @@ static FAST_FUNC BC_STATUS zbc_num_p(BcNum *a, BcNum *b, BcNum *restrict c, size
BcNum copy; BcNum copy;
unsigned long pow; unsigned long pow;
size_t i, powrdx, resrdx; size_t i, powrdx, resrdx;
bool neg, zero; bool neg;
if (b->rdx) RETURN_STATUS(bc_error("non integer number")); if (b->rdx) RETURN_STATUS(bc_error("non integer number"));
@ -2116,7 +2116,6 @@ static FAST_FUNC BC_STATUS zbc_num_p(BcNum *a, BcNum *b, BcNum *restrict c, size
bc_num_copy(c, &copy); bc_num_copy(c, &copy);
for (resrdx = powrdx, pow >>= 1; pow != 0; pow >>= 1) { for (resrdx = powrdx, pow >>= 1; pow != 0; pow >>= 1) {
powrdx <<= 1; powrdx <<= 1;
s = zbc_num_mul(&copy, &copy, &copy, powrdx); s = zbc_num_mul(&copy, &copy, &copy, powrdx);
if (s) goto err; if (s) goto err;
@ -2141,10 +2140,13 @@ static FAST_FUNC BC_STATUS zbc_num_p(BcNum *a, BcNum *b, BcNum *restrict c, size
if (c->rdx > scale) bc_num_truncate(c, c->rdx - scale); if (c->rdx > scale) bc_num_truncate(c, c->rdx - scale);
// We can't use bc_num_clean() here. // We can't use bc_num_clean() here.
for (zero = true, i = 0; zero && i < c->len; ++i) zero = !c->num[i]; for (i = 0; i < c->len; ++i)
if (zero) bc_num_setToZero(c, scale); if (c->num[i] != 0)
goto skip;
bc_num_setToZero(c, scale);
skip:
err: err:
bc_num_free(&copy); bc_num_free(&copy);
RETURN_STATUS(s); RETURN_STATUS(s);
} }
@ -2989,7 +2991,7 @@ static BC_STATUS zbc_lex_string(BcLex *l)
l->t.t = BC_LEX_STR; l->t.t = BC_LEX_STR;
for (c = l->buf[i]; c != 0 && c != '"'; c = l->buf[++i]) for (c = l->buf[i]; c != '\0' && c != '"'; c = l->buf[++i])
nls += (c == '\n'); nls += (c == '\n');
if (c == '\0') { if (c == '\0') {
@ -5246,14 +5248,16 @@ static size_t bc_program_index(char *code, size_t *bgn)
static char *bc_program_name(char *code, size_t *bgn) static char *bc_program_name(char *code, size_t *bgn)
{ {
size_t i; size_t i;
char c, *s, *str = code + *bgn, *ptr = strchr(str, BC_PARSE_STREND); char *s, *str = code + *bgn, *ptr = strchr(str, BC_PARSE_STREND);
s = xmalloc(ptr - str + 1); s = xmalloc(ptr - str + 1);
c = code[(*bgn)++]; i = 0;
for (;;) {
for (i = 0; c != 0 && c != BC_PARSE_STREND; c = code[(*bgn)++], ++i) char c = code[(*bgn)++];
s[i] = c; if (c == '\0' || c == BC_PARSE_STREND)
break;
s[i++] = c;
}
s[i] = '\0'; s[i] = '\0';
return s; return s;