From 408ea6138bc5e94245ea0ebcb87666b9a47aed99 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Beh=C3=BAn?= Date: Fri, 24 Sep 2021 23:06:49 +0200 Subject: [PATCH] tools: kwboot: Use a function to check whether received byte is a Xmodem reply MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This is a non-functional change that should make the code more readable. Signed-off-by: Marek Behún Reviewed-by: Stefan Roese --- tools/kwboot.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/kwboot.c b/tools/kwboot.c index 7f231c0..2e5684b 100644 --- a/tools/kwboot.c +++ b/tools/kwboot.c @@ -376,6 +376,12 @@ kwboot_xm_makeblock(struct kwboot_block *block, const void *data, } static int +_is_xm_reply(char c) +{ + return c == ACK || c == NAK || c == CAN; +} + +static int kwboot_xm_sendblock(int fd, struct kwboot_block *block) { int rc, retries; @@ -395,10 +401,10 @@ kwboot_xm_sendblock(int fd, struct kwboot_block *block) c = NAK; } - if (c != ACK && c != NAK && c != CAN) + if (!_is_xm_reply(c)) printf("%c", c); - } while (c != ACK && c != NAK && c != CAN); + } while (!_is_xm_reply(c)); if (c != ACK) kwboot_progress(-1, '+'); -- 2.7.4