diff options
| author | Ron Yorston <rmy@pobox.com> | 2022-02-09 09:03:18 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2022-02-09 09:05:39 +0000 |
| commit | 492d0a7492a57fe8f02c766e25960b0ce0d88759 (patch) | |
| tree | 4f5764a5c2250c031ea05e9aeacbb40d7971f493 /miscutils/bc.c | |
| parent | 4734416a21312488a5099a297907783bee4ccc22 (diff) | |
| parent | caa9c4f707b661cf398f2c2d66f54f5b0d8adfe2 (diff) | |
| download | busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.tar.gz busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.tar.bz2 busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.zip | |
Merge busybox into merge
Fix conflicts in reset and ash.
Redefine the new safe_read_key() as a reference to read_key().
Disable SHA256_HWACCEL.
Diffstat (limited to 'miscutils/bc.c')
| -rw-r--r-- | miscutils/bc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/miscutils/bc.c b/miscutils/bc.c index e3f7573c9..fe555d018 100644 --- a/miscutils/bc.c +++ b/miscutils/bc.c | |||
| @@ -6011,7 +6011,7 @@ static BC_STATUS zxc_program_assign(char inst) | |||
| 6011 | #endif | 6011 | #endif |
| 6012 | 6012 | ||
| 6013 | if (ib || sc || left->t == XC_RESULT_OBASE) { | 6013 | if (ib || sc || left->t == XC_RESULT_OBASE) { |
| 6014 | static const char *const msg[] = { | 6014 | static const char *const msg[] ALIGN_PTR = { |
| 6015 | "bad ibase; must be [2,16]", //XC_RESULT_IBASE | 6015 | "bad ibase; must be [2,16]", //XC_RESULT_IBASE |
| 6016 | "bad obase; must be [2,"BC_MAX_OBASE_STR"]", //XC_RESULT_OBASE | 6016 | "bad obase; must be [2,"BC_MAX_OBASE_STR"]", //XC_RESULT_OBASE |
| 6017 | "bad scale; must be [0,"BC_MAX_SCALE_STR"]", //XC_RESULT_SCALE | 6017 | "bad scale; must be [0,"BC_MAX_SCALE_STR"]", //XC_RESULT_SCALE |