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

bc: convert bc_program_logical to "z" function

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2018-12-11 19:37:00 +01:00
parent 09d8df84ee
commit 728e7c9ecb
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
miscutils/bc.c
View File

@ -5933,7 +5933,7 @@ static BC_STATUS zbc_program_negate(void)
# define zbc_program_negate(...) (zbc_program_negate(__VA_ARGS__), BC_STATUS_SUCCESS) # define zbc_program_negate(...) (zbc_program_negate(__VA_ARGS__), BC_STATUS_SUCCESS)
#endif #endif
static BcStatus bc_program_logical(char inst) static BC_STATUS zbc_program_logical(char inst)
{ {
BcStatus s; BcStatus s;
BcResult *opd1, *opd2, res; BcResult *opd1, *opd2, res;
@ -5942,7 +5942,7 @@ static BcStatus bc_program_logical(char inst)
ssize_t cmp; ssize_t cmp;
s = zbc_program_binOpPrep(&opd1, &n1, &opd2, &n2, false); s = zbc_program_binOpPrep(&opd1, &n1, &opd2, &n2, false);
if (s) return s; if (s) RETURN_STATUS(s);
bc_num_init_DEF_SIZE(&res.d.n); bc_num_init_DEF_SIZE(&res.d.n);
@ -5979,8 +5979,11 @@ static BcStatus bc_program_logical(char inst)
bc_program_binOpRetire(&res); bc_program_binOpRetire(&res);
return s; RETURN_STATUS(s);
} }
#if ERRORS_ARE_FATAL
# define zbc_program_logical(...) (zbc_program_logical(__VA_ARGS__), BC_STATUS_SUCCESS)
#endif
#if ENABLE_DC #if ENABLE_DC
static BC_STATUS zbc_program_assignStr(BcResult *r, BcVec *v, static BC_STATUS zbc_program_assignStr(BcResult *r, BcVec *v,
@ -6884,7 +6887,7 @@ static BcStatus bc_program_exec(void)
case BC_INST_REL_NE: case BC_INST_REL_NE:
case BC_INST_REL_LT: case BC_INST_REL_LT:
case BC_INST_REL_GT: case BC_INST_REL_GT:
s = bc_program_logical(inst); s = zbc_program_logical(inst);
break; break;
case BC_INST_READ: case BC_INST_READ:
s = bc_program_read(); s = bc_program_read();