freshlybakedca.ke
Git fork
kwset: 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. Better 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>
authored by
Johannes Schindelin
and committed by
Junio C Hamano
22542b6f
38c696d6
+29
-25
kwset.c
+29
-25
kwset.c
···
197
197
while (link && label != link->label)
198
198
{
199
199
links[depth] = link;
200
-
if (label < link->label)
201
-
dirs[depth++] = L, link = link->llink;
202
-
else
203
-
dirs[depth++] = R, link = link->rlink;
200
+
if (label < link->label) {
201
+
dirs[depth++] = L;
202
+
link = link->llink;
203
+
} else {
204
+
dirs[depth++] = R;
205
+
link = link->rlink;
206
+
}
204
207
}
205
208
206
209
/* The current character doesn't have an outgoing link at
···
257
260
switch (dirs[depth + 1])
258
261
{
259
262
case L:
260
-
r = links[depth], t = r->llink, rl = t->rlink;
261
-
t->rlink = r, r->llink = rl;
263
+
r = links[depth]; t = r->llink; rl = t->rlink;
264
+
t->rlink = r; r->llink = rl;
262
265
t->balance = r->balance = 0;
263
266
break;
264
267
case R:
265
-
r = links[depth], l = r->llink, t = l->rlink;
266
-
rl = t->rlink, lr = t->llink;
267
-
t->llink = l, l->rlink = lr, t->rlink = r, r->llink = rl;
268
+
r = links[depth]; l = r->llink; t = l->rlink;
269
+
rl = t->rlink; lr = t->llink;
270
+
t->llink = l; l->rlink = lr; t->rlink = r; r->llink = rl;
268
271
l->balance = t->balance != 1 ? 0 : -1;
269
272
r->balance = t->balance != (char) -1 ? 0 : 1;
270
273
t->balance = 0;
···
277
280
switch (dirs[depth + 1])
278
281
{
279
282
case R:
280
-
l = links[depth], t = l->rlink, lr = t->llink;
281
-
t->llink = l, l->rlink = lr;
283
+
l = links[depth]; t = l->rlink; lr = t->llink;
284
+
t->llink = l; l->rlink = lr;
282
285
t->balance = l->balance = 0;
283
286
break;
284
287
case L:
285
-
l = links[depth], r = l->rlink, t = r->llink;
286
-
lr = t->llink, rl = t->rlink;
287
-
t->llink = l, l->rlink = lr, t->rlink = r, r->llink = rl;
288
+
l = links[depth]; r = l->rlink; t = r->llink;
289
+
lr = t->llink; rl = t->rlink;
290
+
t->llink = l; l->rlink = lr; t->rlink = r; r->llink = rl;
288
291
l->balance = t->balance != 1 ? 0 : -1;
289
292
r->balance = t->balance != (char) -1 ? 0 : 1;
290
293
t->balance = 0;
···
567
570
{
568
571
while (tp <= ep)
569
572
{
570
-
d = d1[U(tp[-1])], tp += d;
571
-
d = d1[U(tp[-1])], tp += d;
573
+
d = d1[U(tp[-1])]; tp += d;
574
+
d = d1[U(tp[-1])]; tp += d;
572
575
if (d == 0)
573
576
goto found;
574
-
d = d1[U(tp[-1])], tp += d;
575
-
d = d1[U(tp[-1])], tp += d;
576
-
d = d1[U(tp[-1])], tp += d;
577
+
d = d1[U(tp[-1])]; tp += d;
578
+
d = d1[U(tp[-1])]; tp += d;
579
+
d = d1[U(tp[-1])]; tp += d;
577
580
if (d == 0)
578
581
goto found;
579
-
d = d1[U(tp[-1])], tp += d;
580
-
d = d1[U(tp[-1])], tp += d;
581
-
d = d1[U(tp[-1])], tp += d;
582
+
d = d1[U(tp[-1])]; tp += d;
583
+
d = d1[U(tp[-1])]; tp += d;
584
+
d = d1[U(tp[-1])]; tp += d;
582
585
if (d == 0)
583
586
goto found;
584
-
d = d1[U(tp[-1])], tp += d;
585
-
d = d1[U(tp[-1])], tp += d;
587
+
d = d1[U(tp[-1])]; tp += d;
588
+
d = d1[U(tp[-1])]; tp += d;
586
589
}
587
590
break;
588
591
found:
···
649
652
mch = NULL;
650
653
else
651
654
{
652
-
mch = text, accept = kwset->trie;
655
+
mch = text;
656
+
accept = kwset->trie;
653
657
goto match;
654
658
}
655
659