mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH] scripts/kwboot: Fix normalizing timeval
Date: Tue, 30 Nov 2021 17:03:08 +0100	[thread overview]
Message-ID: <20211130160308.316863-1-u.kleine-koenig@pengutronix.de> (raw)

If tv.tv_usec is 1000000 the structure needs normalizing, too. So the
right check would be:

	if (tv.tv_usec >= 1000000) {
		...

But as normalizing doesn't destroy anything even for smaller values,
just do it unconditionally to simplify a bit.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 scripts/kwboot.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/scripts/kwboot.c b/scripts/kwboot.c
index 60e8a69d187d..1cbb456935f2 100644
--- a/scripts/kwboot.c
+++ b/scripts/kwboot.c
@@ -147,12 +147,11 @@ kwboot_tty_recv(int fd, void *buf, size_t len, int timeo)
 	FD_ZERO(&rfds);
 	FD_SET(fd, &rfds);
 
-	tv.tv_sec = 0;
 	tv.tv_usec = timeo * 1000;
-	if (tv.tv_usec > 1000000) {
-		tv.tv_sec += tv.tv_usec / 1000000;
-		tv.tv_usec %= 1000000;
-	}
+
+	/* normalize timeval */
+	tv.tv_sec = tv.tv_usec / 1000000;
+	tv.tv_usec %= 1000000;
 
 	do {
 		nfds = select(fd + 1, &rfds, NULL, NULL, &tv);

base-commit: f2dd8896846757829fb3033f41b89be3fc037d78
-- 
2.30.2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

             reply	other threads:[~2021-11-30 16:04 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-30 16:03 Uwe Kleine-König [this message]
2021-12-07  9:07 ` Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211130160308.316863-1-u.kleine-koenig@pengutronix.de \
    --to=u.kleine-koenig@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --subject='Re: [PATCH] scripts/kwboot: Fix normalizing timeval' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox