f3efd3c2a
Denys Vlasenko
2011-11-03
Subject
rx: code shrink
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
miscutils/rx.c+7 -13
| @@ -108,12 +108,10 @@ static int receive(/*int read_fd, */int file_fd) | |
| } | |
| } | |
| /* Write previously received block */ | |
| - | if (blockLength) { |
| - | errno = 0; |
| - | if (full_write(file_fd, blockBuf, blockLength) != blockLength) { |
| - | bb_perror_msg("can't write to file"); |
| - | goto fatal; |
| - | } |
| + | errno = 0; |
| + | if (full_write(file_fd, blockBuf, blockLength) != blockLength) { |
| + | bb_perror_msg(bb_msg_write_error); |
| + | goto fatal; |
| } | |
| timeout = TIMEOUT; | |
| @@ -155,17 +153,13 @@ static int receive(/*int read_fd, */int file_fd) | |
| blockBuf[i] = cc; | |
| } | |
| + | cksum_or_crc = read_byte(TIMEOUT); |
| + | if (cksum_or_crc < 0) |
| + | goto timeout; |
| if (do_crc) { | |
| - | cksum_or_crc = read_byte(TIMEOUT); |
| - | if (cksum_or_crc < 0) |
| - | goto timeout; |
| cksum_or_crc = (cksum_or_crc << 8) | read_byte(TIMEOUT); | |
| if (cksum_or_crc < 0) | |
| goto timeout; | |
| - | } else { |
| - | cksum_or_crc = read_byte(TIMEOUT); |
| - | if (cksum_or_crc < 0) |
| - | goto timeout; |
| } | |
| if (blockNo == ((wantBlockNo - 1) & 0xff)) { | |