diff options
| author | Ron Yorston <rmy@pobox.com> | 2013-02-07 14:25:54 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2013-02-07 14:25:54 +0000 |
| commit | b604585914e032b28bef3e337a978e56a9069cda (patch) | |
| tree | b2ee0a3fb38d10397c602d0fe215ea3bbbf334c0 /miscutils/rx.c | |
| parent | 0eda07c7ff8cf1fc11bc1bda5383f884d7adf031 (diff) | |
| parent | ba76b7a40b929878833731f76306b1c977cc8650 (diff) | |
| download | busybox-w32-b604585914e032b28bef3e337a978e56a9069cda.tar.gz busybox-w32-b604585914e032b28bef3e337a978e56a9069cda.tar.bz2 busybox-w32-b604585914e032b28bef3e337a978e56a9069cda.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'miscutils/rx.c')
| -rw-r--r-- | miscutils/rx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/miscutils/rx.c b/miscutils/rx.c index af597320c..1dffb593a 100644 --- a/miscutils/rx.c +++ b/miscutils/rx.c | |||
| @@ -193,8 +193,8 @@ static int receive(/*int read_fd, */int file_fd) | |||
| 193 | } | 193 | } |
| 194 | if (cksum_or_crc != expected) { | 194 | if (cksum_or_crc != expected) { |
| 195 | bb_error_msg(do_crc ? "crc error, expected 0x%04x, got 0x%04x" | 195 | bb_error_msg(do_crc ? "crc error, expected 0x%04x, got 0x%04x" |
| 196 | : "checksum error, expected 0x%02x, got 0x%02x", | 196 | : "checksum error, expected 0x%02x, got 0x%02x", |
| 197 | expected, cksum_or_crc); | 197 | expected, cksum_or_crc); |
| 198 | goto error; | 198 | goto error; |
| 199 | } | 199 | } |
| 200 | 200 | ||