diff options
| author | Denys Vlasenko | 2018-12-11 19:37:00 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2018-12-11 19:37:00 +0100 |
| commit | 728e7c9ecb1b64473412fe45caf1623e22a9204b (patch) | |
| tree | a83a277588d50455a07657436bd8776e5ef753e3 | |
| parent | 09d8df84ee908b940a31822c3480f36f817e4f09 (diff) | |
| download | busybox-728e7c9ecb1b64473412fe45caf1623e22a9204b.zip busybox-728e7c9ecb1b64473412fe45caf1623e22a9204b.tar.gz | |
bc: convert bc_program_logical to "z" function
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | miscutils/bc.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/miscutils/bc.c b/miscutils/bc.c index e7f48fc..acc0b60 100644 --- a/miscutils/bc.c +++ b/miscutils/bc.c @@ -5933,7 +5933,7 @@ static BC_STATUS zbc_program_negate(void) # define zbc_program_negate(...) (zbc_program_negate(__VA_ARGS__), BC_STATUS_SUCCESS) #endif -static BcStatus bc_program_logical(char inst) +static BC_STATUS zbc_program_logical(char inst) { BcStatus s; BcResult *opd1, *opd2, res; @@ -5942,7 +5942,7 @@ static BcStatus bc_program_logical(char inst) ssize_t cmp; 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); @@ -5979,8 +5979,11 @@ static BcStatus bc_program_logical(char inst) 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 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_LT: case BC_INST_REL_GT: - s = bc_program_logical(inst); + s = zbc_program_logical(inst); break; case BC_INST_READ: s = bc_program_read(); |