xdiff: avoid using the comma operator unnecessarily
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> Acked-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Mar 27, 2025 at 11:52 UTC
324fbaab88126196bd42e7fa383ee94e165d61b5
1 file changed
+8
-4
xdiff/xdiffi.c
+8
-4
@@ -211,8 +211,10 @@ static long xdl_split(unsigned long const *ha1, long off1, long lim1,
211
for (d = fmax; d >= fmin; d -= 2) {
212
i1 = XDL_MIN(kvdf[d], lim1);
213
i2 = i1 - d;
214
- if (lim2 < i2)
215
- i1 = lim2 + d, i2 = lim2;
214
+ if (lim2 < i2) {
215
+ i1 = lim2 + d;
216
+ i2 = lim2;
217
+ }
218
if (fbest < i1 + i2) {
219
fbest = i1 + i2;
220
fbest1 = i1;
@@ -223,8 +225,10 @@ static long xdl_split(unsigned long const *ha1, long off1, long lim1,
225
for (d = bmax; d >= bmin; d -= 2) {
226
i1 = XDL_MAX(off1, kvdb[d]);
227
i2 = i1 - d;
226
- if (i2 < off2)
227
- i1 = off2 + d, i2 = off2;
228
+ if (i2 < off2) {
229
+ i1 = off2 + d;
230
+ i2 = off2;
231
+ }
232
if (i1 + i2 < bbest) {
233
bbest = i1 + i2;
234
bbest1 = i1;