From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Jonathan Nieder <jrnieder@gmail.com>
Subject: Re: [PATCH v2 3/7] prefer "!=" when checking read_in_full() result
Date: Wed, 27 Sep 2017 15:59:15 +0900 [thread overview]
Message-ID: <xmqqr2us4ofw.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: 20170927060028.ehddn5zwf6v6jsvs@sigill.intra.peff.net
Jeff King <peff@peff.net> writes:
> diff --git a/csum-file.c b/csum-file.c
> index a172199e44..2adae04073 100644
> --- a/csum-file.c
> +++ b/csum-file.c
> @@ -19,7 +19,7 @@ static void flush(struct sha1file *f, const void *buf, unsigned int count)
>
> if (ret < 0)
> die_errno("%s: sha1 file read error", f->name);
> - if (ret < count)
> + if (ret != count)
> die("%s: sha1 file truncated", f->name);
I personally find that this "ret < count" that comes after checking
if ret is negative expresses what it is checking in a more natural
way than "ret must be exactly count".
It is not a big deal, as either one needs to be read with an
understanding that read_in_full() would read at most "count" bytes
to see if the right condition is being checked to declare
"truncated" anyway. But I somehow find
ret = read up to count
if (ret < 0)
read failed
if (ret < count)
we failed to read as much as expected
a bit more natural.
> diff --git a/pkt-line.c b/pkt-line.c
> index 647bbd3bce..93ea311443 100644
> --- a/pkt-line.c
> +++ b/pkt-line.c
> @@ -258,7 +258,7 @@ static int get_packet_data(int fd, char **src_buf, size_t *src_size,
> }
>
> /* And complain if we didn't get enough bytes to satisfy the read. */
> - if (ret < size) {
> + if (ret != size) {
> if (options & PACKET_READ_GENTLE_ON_EOF)
> return -1;
Likewise, even though it is harder to see that this follows another
explicit check for "ret < 0".
Thanks.
next prev parent reply other threads:[~2017-09-27 6:59 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-25 20:26 [PATCH 0/7] read/write_in_full leftovers Jeff King
2017-09-25 20:27 ` [PATCH 1/7] files-backend: prefer "0" for write_in_full() error check Jeff King
2017-09-25 21:59 ` Jonathan Nieder
2017-09-25 23:13 ` Jeff King
2017-09-25 20:27 ` [PATCH 2/7] notes-merge: drop dead zero-write code Jeff King
2017-09-25 21:59 ` Jonathan Nieder
2017-09-25 20:29 ` [PATCH 3/7] read_in_full: reset errno before reading Jeff King
2017-09-25 22:09 ` Jonathan Nieder
2017-09-25 23:23 ` Jeff King
2017-09-25 23:33 ` Jonathan Nieder
2017-09-25 23:37 ` Jeff King
2017-09-25 23:45 ` Jeff King
2017-09-25 23:55 ` Jonathan Nieder
2017-09-26 0:01 ` Jeff King
2017-09-26 0:06 ` Stefan Beller
2017-09-26 0:09 ` Jeff King
2017-09-26 0:16 ` Jonathan Nieder
2017-09-26 0:17 ` Jonathan Nieder
2017-09-26 0:19 ` Jeff King
2017-09-26 0:22 ` Jonathan Nieder
2017-09-26 4:11 ` Junio C Hamano
2017-09-27 4:07 ` Jeff King
2017-09-27 4:27 ` Junio C Hamano
2017-09-26 0:13 ` Jonathan Nieder
2017-09-26 0:17 ` Jeff King
2017-09-26 0:20 ` Jonathan Nieder
2017-09-26 0:25 ` Jeff King
2017-09-26 0:28 ` Jonathan Nieder
2017-09-25 23:52 ` Jonathan Nieder
2017-09-25 20:29 ` [PATCH 4/7] get-tar-commit-id: prefer "!=" for read_in_full() error check Jeff King
2017-09-25 22:10 ` Jonathan Nieder
2017-09-25 20:30 ` [PATCH 5/7] worktree: use xsize_t to access file size Jeff King
2017-09-25 22:11 ` Jonathan Nieder
2017-09-25 20:31 ` [PATCH 6/7] worktree: check the result of read_in_full() Jeff King
2017-09-25 22:14 ` Jonathan Nieder
2017-09-25 23:25 ` Jeff King
2017-09-25 20:33 ` [PATCH 7/7] add xread_in_full() helper Jeff King
2017-09-25 22:16 ` Jonathan Nieder
2017-09-25 23:27 ` Jeff King
2017-09-27 5:54 ` [PATCH v2 0/7] read/write_in_full leftovers Jeff King
2017-09-27 6:00 ` [PATCH v2 1/7] files-backend: prefer "0" for write_in_full() error check Jeff King
2017-09-27 6:00 ` [PATCH v2 2/7] notes-merge: drop dead zero-write code Jeff King
2017-09-27 6:00 ` [PATCH v2 3/7] prefer "!=" when checking read_in_full() result Jeff King
2017-09-27 6:59 ` Junio C Hamano [this message]
2017-09-27 7:09 ` Jeff King
2017-09-27 6:01 ` [PATCH v2 4/7] avoid looking at errno for short read_in_full() returns Jeff King
2017-09-27 6:59 ` Junio C Hamano
2017-09-27 6:02 ` [PATCH v2 5/7] distinguish error versus short read from read_in_full() Jeff King
2017-09-27 6:02 ` [PATCH v2 6/7] worktree: use xsize_t to access file size Jeff King
2017-09-27 6:02 ` [PATCH v2 7/7] worktree: check the result of read_in_full() Jeff King
2017-09-27 6:57 ` [PATCH v2 0/7] read/write_in_full leftovers Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqr2us4ofw.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).