From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail•com>
To: git@vger•kernel.org
Cc: 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>,
Johannes Schindelin <johannes.schindelin@gmx•de>
Subject: [PATCH v2 05/10] xdiff: avoid using the comma operator unnecessarily
Date: Tue, 25 Mar 2025 23:32:09 +0000 [thread overview]
Message-ID: <7239078413f6a223105939af1b56e79b9d302f1f.1742945534.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1889.v2.git.1742945534.gitgitgadget@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx•de>
The comma operator is a somewhat obscure C feature that is often used by
mistake and can even cause unintentional code flow. While the code in
this patch used the comma operator intentionally (to avoid curly
brackets around two statements, each, that want to be guarded by a
condition), it is better to surround it with curly brackets and to use a
semicolon instead.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx•de>
---
xdiff/xdiffi.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c
index 8889b8b62a1..5a96e36dfbe 100644
--- a/xdiff/xdiffi.c
+++ b/xdiff/xdiffi.c
@@ -211,8 +211,10 @@ static long xdl_split(unsigned long const *ha1, long off1, long lim1,
for (d = fmax; d >= fmin; d -= 2) {
i1 = XDL_MIN(kvdf[d], lim1);
i2 = i1 - d;
- if (lim2 < i2)
- i1 = lim2 + d, i2 = lim2;
+ if (lim2 < i2) {
+ i1 = lim2 + d;
+ i2 = lim2;
+ }
if (fbest < i1 + i2) {
fbest = i1 + i2;
fbest1 = i1;
@@ -223,8 +225,10 @@ static long xdl_split(unsigned long const *ha1, long off1, long lim1,
for (d = bmax; d >= bmin; d -= 2) {
i1 = XDL_MAX(off1, kvdb[d]);
i2 = i1 - d;
- if (i2 < off2)
- i1 = off2 + d, i2 = off2;
+ if (i2 < off2) {
+ i1 = off2 + d;
+ i2 = off2;
+ }
if (i1 + i2 < bbest) {
bbest = i1 + i2;
bbest1 = i1;
--
gitgitgadget
next prev parent reply other threads:[~2025-03-25 23:32 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 ` Johannes Schindelin via GitGitGadget [this message]
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
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=7239078413f6a223105939af1b56e79b9d302f1f.1742945534.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--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