From: Junio C Hamano <gitster@pobox•com>
To: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail•com>
Cc: git@vger•kernel.org, Philip Oakley <philipoakley@iee•email>,
Patrick Steinhardt <ps@pks•im>,
Phillip Wood <phillip.wood123@gmail•com>,
Karthik Nayak <karthik.188@gmail•com>, Jeff King <peff@peff•net>,
Johannes Schindelin <johannes.schindelin@gmx•de>
Subject: Re: [PATCH v2 07/10] wildmatch: explicitly mark intentional use of the comma operator
Date: Wed, 26 Mar 2025 00:49:52 -0700 [thread overview]
Message-ID: <xmqq4izgjknz.fsf@gitster.g> (raw)
In-Reply-To: <9a6de12b8076266fb0c88f6b658c20d37409ce13.1742945534.git.gitgitgadget@gmail.com> (Johannes Schindelin via GitGitGadget's message of "Tue, 25 Mar 2025 23:32:11 +0000")
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail•com>
writes:
> diff --git a/wildmatch.c b/wildmatch.c
> index 8ea29141bd7..ce8108a6d57 100644
> --- a/wildmatch.c
> +++ b/wildmatch.c
> @@ -268,7 +268,7 @@ static int dowild(const uchar *p, const uchar *text, unsigned int flags)
> p_ch = 0; /* This makes "prev_ch" get set to 0. */
> } else if (t_ch == p_ch)
> matched = 1;
> - } while (prev_ch = p_ch, (p_ch = *++p) != ']');
> + } while ((void)(prev_ch = p_ch), (p_ch = *++p) != ']');
> if (matched == negated ||
> ((flags & WM_PATHNAME) && t_ch == '/'))
> return WM_NOMATCH;
Hmph, I personally do not find the (void) convention any easier to
read and understand than the original, and more importantly, it does
not look like a good signal to say that the author knows what they
are doing.
For this particular loop, it probably makes a lot more sense to do a
stupid and more obvious rewrite. And the same thing can be said for
the previous step.
Perhaps like so?
diff-delta.c | 37 ++++++++++++++++++++++++-------------
wildmatch.c | 4 +++-
2 files changed, 27 insertions(+), 14 deletions(-)
diff --git c/diff-delta.c w/diff-delta.c
index a4faf73829..a999b875d4 100644
--- c/diff-delta.c
+++ w/diff-delta.c
@@ -438,19 +438,30 @@ create_delta(const struct delta_index *index,
op = out + outpos++;
i = 0x80;
- if (moff & 0x000000ff)
- out[outpos++] = moff >> 0, i |= 0x01;
- if (moff & 0x0000ff00)
- out[outpos++] = moff >> 8, i |= 0x02;
- if (moff & 0x00ff0000)
- out[outpos++] = moff >> 16, i |= 0x04;
- if (moff & 0xff000000)
- out[outpos++] = moff >> 24, i |= 0x08;
-
- if (msize & 0x00ff)
- out[outpos++] = msize >> 0, i |= 0x10;
- if (msize & 0xff00)
- out[outpos++] = msize >> 8, i |= 0x20;
+ if (moff & 0x000000ff) {
+ out[outpos++] = moff >> 0;
+ i |= 0x01;
+ }
+ if (moff & 0x0000ff00) {
+ out[outpos++] = moff >> 8;
+ i |= 0x02;
+ }
+ if (moff & 0x00ff0000) {
+ out[outpos++] = moff >> 16;
+ i |= 0x04;
+ }
+ if (moff & 0xff000000) {
+ out[outpos++] = moff >> 24;
+ i |= 0x08;
+ }
+ if (msize & 0x00ff) {
+ out[outpos++] = msize >> 0;
+ i |= 0x10;
+ }
+ if (msize & 0xff00) {
+ out[outpos++] = msize >> 8;
+ i |= 0x20;
+ }
*op = i;
diff --git c/wildmatch.c w/wildmatch.c
index 8ea29141bd..29f4b4df75 100644
--- c/wildmatch.c
+++ w/wildmatch.c
@@ -268,7 +268,9 @@ static int dowild(const uchar *p, const uchar *text, unsigned int flags)
p_ch = 0; /* This makes "prev_ch" get set to 0. */
} else if (t_ch == p_ch)
matched = 1;
- } while (prev_ch = p_ch, (p_ch = *++p) != ']');
+
+ prev_ch = p_ch;
+ } while ((p_ch = *++p) != ']');
if (matched == negated ||
((flags & WM_PATHNAME) && t_ch == '/'))
return WM_NOMATCH;
next prev parent reply other threads:[~2025-03-26 7:49 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-25 8:01 [PATCH 0/2] Avoid the comma operator Johannes Schindelin via GitGitGadget
2025-03-25 8:01 ` [PATCH 1/2] remote-curl: avoid using the comma operator unnecessarily Johannes Schindelin via GitGitGadget
2025-03-25 16:28 ` Phillip Wood
2025-03-25 16:55 ` Jeff King
2025-03-25 8:01 ` [PATCH 2/2] rebase: " Johannes Schindelin via GitGitGadget
2025-03-25 14:35 ` Phillip Wood
2025-03-25 11:41 ` [PATCH 0/2] Avoid the comma operator Philip Oakley
2025-03-25 14:12 ` Johannes Schindelin
2025-03-26 17:29 ` Taylor Blau
2025-03-25 12:22 ` Patrick Steinhardt
2025-03-25 14:13 ` Johannes Schindelin
2025-03-26 20:17 ` Taylor Blau
2025-03-25 14:37 ` Karthik Nayak
2025-03-25 19:34 ` Junio C Hamano
2025-03-25 23:32 ` [PATCH v2 00/10] " Johannes Schindelin via GitGitGadget
2025-03-25 23:32 ` [PATCH v2 01/10] remote-curl: avoid using the comma operator unnecessarily Johannes Schindelin via GitGitGadget
2025-03-25 23:32 ` [PATCH v2 02/10] rebase: " Johannes Schindelin via GitGitGadget
2025-03-25 23:32 ` [PATCH v2 03/10] kwset: " Johannes Schindelin via GitGitGadget
2025-03-25 23:32 ` [PATCH v2 04/10] clar: " Johannes Schindelin via GitGitGadget
2025-03-26 5:54 ` Patrick Steinhardt
2025-03-26 7:03 ` Johannes Schindelin
2025-03-25 23:32 ` [PATCH v2 05/10] xdiff: " Johannes Schindelin via GitGitGadget
2025-03-25 23:32 ` [PATCH v2 06/10] diff-delta: explicitly mark intentional use of the comma operator Johannes Schindelin via GitGitGadget
2025-03-26 5:54 ` Patrick Steinhardt
2025-03-26 7:20 ` Johannes Schindelin
2025-03-26 10:17 ` Phillip Wood
2025-03-26 20:33 ` Taylor Blau
2025-03-27 1:31 ` Chris Torek
2025-03-25 23:32 ` [PATCH v2 07/10] wildmatch: " Johannes Schindelin via GitGitGadget
2025-03-26 5:54 ` Patrick Steinhardt
2025-03-26 7:46 ` Johannes Schindelin
2025-03-26 7:49 ` Junio C Hamano [this message]
2025-03-26 10:14 ` Phillip Wood
2025-03-26 10:34 ` Junio C Hamano
2025-03-25 23:32 ` [PATCH v2 08/10] compat/regex: " Johannes Schindelin via GitGitGadget
2025-03-26 20:35 ` Taylor Blau
2025-03-27 10:29 ` Johannes Schindelin
2025-03-27 21:51 ` Taylor Blau
2025-03-25 23:32 ` [PATCH v2 09/10] clang: warn when the comma operator is used Johannes Schindelin via GitGitGadget
2025-03-26 5:54 ` Patrick Steinhardt
2025-03-26 7:50 ` Johannes Schindelin
2025-03-26 8:33 ` Patrick Steinhardt
2025-03-27 10:18 ` Johannes Schindelin
2025-03-25 23:32 ` [PATCH v2 10/10] detect-compiler: detect clang even if it found CUDA Johannes Schindelin via GitGitGadget
2025-03-26 17:41 ` Jeff King
2025-03-26 18:07 ` Eric Sunshine
2025-03-27 5:14 ` Jeff King
2025-03-27 5:21 ` Eric Sunshine
2025-03-27 6:35 ` Jeff King
2025-03-26 5:54 ` [PATCH v2 00/10] Avoid the comma operator Patrick Steinhardt
2025-03-26 17:50 ` Jeff King
2025-03-27 11:52 ` [PATCH v3 " Johannes Schindelin via GitGitGadget
2025-03-27 11:52 ` [PATCH v3 01/10] remote-curl: avoid using the comma operator unnecessarily Johannes Schindelin via GitGitGadget
2025-03-27 11:52 ` [PATCH v3 02/10] rebase: " Johannes Schindelin via GitGitGadget
2025-03-27 11:52 ` [PATCH v3 03/10] kwset: " Johannes Schindelin via GitGitGadget
2025-03-27 11:52 ` [PATCH v3 04/10] clar: " Johannes Schindelin via GitGitGadget
2025-03-27 11:52 ` [PATCH v3 05/10] xdiff: " Johannes Schindelin via GitGitGadget
2025-03-27 11:52 ` [PATCH v3 06/10] diff-delta: avoid using the comma operator Johannes Schindelin via GitGitGadget
2025-03-27 11:53 ` [PATCH v3 07/10] wildmatch: avoid using of " Johannes Schindelin via GitGitGadget
2025-03-27 11:53 ` [PATCH v3 08/10] compat/regex: explicitly mark intentional use " Johannes Schindelin via GitGitGadget
2025-03-27 11:53 ` [PATCH v3 09/10] clang: warn when the comma operator is used Johannes Schindelin via GitGitGadget
2025-03-27 11:53 ` [PATCH v3 10/10] detect-compiler: detect clang even if it found CUDA Johannes Schindelin via GitGitGadget
2025-03-27 15:07 ` [PATCH v3 00/10] Avoid the comma operator Phillip Wood
2025-03-29 0:39 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq4izgjknz.fsf@gitster.g \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitgitgadget@gmail$(echo .)com \
--cc=johannes.schindelin@gmx$(echo .)de \
--cc=karthik.188@gmail$(echo .)com \
--cc=peff@peff$(echo .)net \
--cc=philipoakley@iee$(echo .)email \
--cc=phillip.wood123@gmail$(echo .)com \
--cc=ps@pks$(echo .)im \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox