[git commit] bc: fold zbc_num_stream() into its single caller
Denys Vlasenko
vda.linux at googlemail.com
Tue Dec 18 02:30:23 UTC 2018
commit: https://git.busybox.net/busybox/commit/?id=57734c926bbfe69d1c3bb6096fbdf428628ed838
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
miscutils/bc.c | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/miscutils/bc.c b/miscutils/bc.c
index c65555fe2..e5ad0ed86 100644
--- a/miscutils/bc.c
+++ b/miscutils/bc.c
@@ -5486,14 +5486,6 @@ static BC_STATUS zbc_num_printBase(BcNum *n)
}
#define zbc_num_printBase(...) (zbc_num_printBase(__VA_ARGS__) COMMA_SUCCESS)
-#if ENABLE_DC
-static BC_STATUS zbc_num_stream(BcNum *n, BcNum *base)
-{
- RETURN_STATUS(zbc_num_printNum(n, base, 1, bc_num_printChar));
-}
-#define zbc_num_stream(...) (zbc_num_stream(__VA_ARGS__) COMMA_SUCCESS)
-#endif
-
static BC_STATUS zbc_num_print(BcNum *n, bool newline)
{
BcStatus s = BC_STATUS_SUCCESS;
@@ -6259,9 +6251,9 @@ static BC_STATUS zbc_program_printStream(void)
s = zbc_program_num(r, &n, false);
if (s) RETURN_STATUS(s);
- if (BC_PROG_NUM(r, n))
- s = zbc_num_stream(n, &G.prog.strmb);
- else {
+ if (BC_PROG_NUM(r, n)) {
+ s = zbc_num_printNum(n, &G.prog.strmb, 1, bc_num_printChar);
+ } else {
idx = (r->t == BC_RESULT_STR) ? r->d.id.idx : n->rdx;
str = *bc_program_str(idx);
printf("%s", str);
More information about the busybox-cvs
mailing list