mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

ydiff.c: refactror loops: replace 'while' with 'for' where reasonably.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2023-09-02 15:04:10 +03:00
parent 6a10d8e932
commit e1ee8a4da2
1 changed files with 33 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
src/diffviewer/ydiff.c
View File

@ -926,19 +926,13 @@ dff_reparse (diff_place_t ord, const char *filename, const GArray * ops, DFUNC p
goto err; goto err;
if (op->cmd == add_cmd) if (op->cmd == add_cmd)
{ for (n = op->T2 - op->T1 + 1; n != 0; n--)
n = op->T2 - op->T1 + 1;
while (n != 0)
{
printer (ctx, DEL_CH, 0, 0, 1, "\n"); printer (ctx, DEL_CH, 0, 0, 1, "\n");
n--;
}
}
if (op->cmd == del_cmd) if (op->cmd == del_cmd)
{ {
n = op->F2 - op->F1 + 1; for (n = op->F2 - op->F1 + 1; n != 0 && (sz = dview_fgets (buf, sizeof (buf), f)) != 0;
while (n != 0 && (sz = dview_fgets (buf, sizeof (buf), f)) != 0) n--)
{ {
line++; line++;
printer (ctx, ADD_CH, line, off, sz, buf); printer (ctx, ADD_CH, line, off, sz, buf);
@ -954,7 +948,6 @@ dff_reparse (diff_place_t ord, const char *filename, const GArray * ops, DFUNC p
printer (ctx, 0, 0, 0, sz, buf); printer (ctx, 0, 0, 0, sz, buf);
off += sz; off += sz;
} }
n--;
} }
if (n != 0) if (n != 0)
@ -963,8 +956,8 @@ dff_reparse (diff_place_t ord, const char *filename, const GArray * ops, DFUNC p
if (op->cmd == 'c') if (op->cmd == 'c')
{ {
n = op->F2 - op->F1 + 1; for (n = op->F2 - op->F1 + 1;
while (n != 0 && (sz = dview_fgets (buf, sizeof (buf), f)) != 0) n != 0 && (sz = dview_fgets (buf, sizeof (buf), f)) != 0; n--)
{ {
line++; line++;
printer (ctx, CHG_CH, line, off, sz, buf); printer (ctx, CHG_CH, line, off, sz, buf);
@ -980,18 +973,13 @@ dff_reparse (diff_place_t ord, const char *filename, const GArray * ops, DFUNC p
printer (ctx, 0, 0, 0, sz, buf); printer (ctx, 0, 0, 0, sz, buf);
off += sz; off += sz;
} }
n--;
} }
if (n != 0) if (n != 0)
goto err; goto err;
n = op->T2 - op->T1 - (op->F2 - op->F1); for (n = op->T2 - op->T1 - (op->F2 - op->F1); n > 0; n--)
while (n > 0)
{
printer (ctx, CHG_CH, 0, 0, 1, "\n"); printer (ctx, CHG_CH, 0, 0, 1, "\n");
n--;
}
} }
} }
#undef T2 #undef T2
@ -1919,19 +1907,19 @@ static int
find_prev_hunk (const GArray * a, int pos) find_prev_hunk (const GArray * a, int pos)
{ {
#if 1 #if 1
while (pos > 0 && ((DIFFLN *) & g_array_index (a, DIFFLN, pos))->ch != EQU_CH) for (; pos > 0 && ((DIFFLN *) & g_array_index (a, DIFFLN, pos))->ch != EQU_CH; pos--)
pos--; ;
while (pos > 0 && ((DIFFLN *) & g_array_index (a, DIFFLN, pos))->ch == EQU_CH) for (; pos > 0 && ((DIFFLN *) & g_array_index (a, DIFFLN, pos))->ch == EQU_CH; pos--)
pos--; ;
while (pos > 0 && ((DIFFLN *) & g_array_index (a, DIFFLN, pos))->ch != EQU_CH) for (; pos > 0 && ((DIFFLN *) & g_array_index (a, DIFFLN, pos))->ch != EQU_CH; pos--)
pos--; ;
if (pos > 0 && (size_t) pos < a->len) if (pos > 0 && (size_t) pos < a->len)
pos++; pos++;
#else #else
while (pos > 0 && ((DIFFLN *) & g_array_index (a, DIFFLN, pos - 1))->ch == EQU_CH) for (; pos > 0 && ((DIFFLN *) & g_array_index (a, DIFFLN, pos - 1))->ch == EQU_CH; pos--)
pos--; ;
while (pos > 0 && ((DIFFLN *) & g_array_index (a, DIFFLN, pos - 1))->ch != EQU_CH) for (; pos > 0 && ((DIFFLN *) & g_array_index (a, DIFFLN, pos - 1))->ch != EQU_CH; pos--)
pos--; ;
#endif #endif
return pos; return pos;
@ -1942,10 +1930,10 @@ find_prev_hunk (const GArray * a, int pos)
static size_t static size_t
find_next_hunk (const GArray * a, size_t pos) find_next_hunk (const GArray * a, size_t pos)
{ {
while (pos < a->len && ((DIFFLN *) & g_array_index (a, DIFFLN, pos))->ch != EQU_CH) for (; pos < a->len && ((DIFFLN *) & g_array_index (a, DIFFLN, pos))->ch != EQU_CH; pos++)
pos++; ;
while (pos < a->len && ((DIFFLN *) & g_array_index (a, DIFFLN, pos))->ch == EQU_CH) for (; pos < a->len && ((DIFFLN *) & g_array_index (a, DIFFLN, pos))->ch == EQU_CH; pos++)
pos++; ;
return pos; return pos;
} }
@ -1993,15 +1981,17 @@ get_current_hunk (WDiff * dview, int *start_line1, int *end_line1, int *start_li
default: default:
break; break;
} }
while (pos > 0 && ((DIFFLN *) & g_array_index (a0, DIFFLN, pos))->ch != EQU_CH)
pos--; for (; pos > 0 && ((DIFFLN *) & g_array_index (a0, DIFFLN, pos))->ch != EQU_CH; pos--)
;
if (pos > 0) if (pos > 0)
{ {
*start_line1 = ((DIFFLN *) & g_array_index (a0, DIFFLN, pos))->line + 1; *start_line1 = ((DIFFLN *) & g_array_index (a0, DIFFLN, pos))->line + 1;
*start_line2 = ((DIFFLN *) & g_array_index (a1, DIFFLN, pos))->line + 1; *start_line2 = ((DIFFLN *) & g_array_index (a1, DIFFLN, pos))->line + 1;
} }
pos = dview->skip_rows;
while (pos < a0->len && ((DIFFLN *) & g_array_index (a0, DIFFLN, pos))->ch != EQU_CH) for (pos = dview->skip_rows;
pos < a0->len && ((DIFFLN *) & g_array_index (a0, DIFFLN, pos))->ch != EQU_CH; pos++)
{ {
int l0, l1; int l0, l1;
@ -2011,7 +2001,6 @@ get_current_hunk (WDiff * dview, int *start_line1, int *end_line1, int *start_li
*end_line1 = MAX (*start_line1, l0); *end_line1 = MAX (*start_line1, l0);
if (l1 > 0) if (l1 > 0)
*end_line2 = MAX (*start_line2, l1); *end_line2 = MAX (*start_line2, l1);
pos++;
} }
} }
return res; return res;
@ -2041,12 +2030,9 @@ dview_remove_hunk (WDiff * dview, FILE * merge_file, int from1, int to1,
else else
f0 = fopen (dview->file[DIFF_LEFT], "r"); f0 = fopen (dview->file[DIFF_LEFT], "r");
line = 0; for (line = 0; fgets (buf, sizeof (buf), f0) != NULL && line < from1 - 1; line++)
while (fgets (buf, sizeof (buf), f0) != NULL && line < from1 - 1)
{
line++;
fputs (buf, merge_file); fputs (buf, merge_file);
}
while (fgets (buf, sizeof (buf), f0) != NULL) while (fgets (buf, sizeof (buf), f0) != NULL)
{ {
line++; line++;
@ -2087,14 +2073,9 @@ dview_add_hunk (WDiff * dview, FILE * merge_file, int from1, int from2, int to2,
f1 = fopen (dview->file[DIFF_RIGHT], "r"); f1 = fopen (dview->file[DIFF_RIGHT], "r");
} }
line = 0; for (line = 0; fgets (buf, sizeof (buf), f0) != NULL && line < from1 - 1; line++)
while (fgets (buf, sizeof (buf), f0) != NULL && line < from1 - 1)
{
line++;
fputs (buf, merge_file); fputs (buf, merge_file);
} for (line = 0; fgets (buf, sizeof (buf), f1) != NULL && line <= to2;)
line = 0;
while (fgets (buf, sizeof (buf), f1) != NULL && line <= to2)
{ {
line++; line++;
if (line >= from2) if (line >= from2)
@ -2124,8 +2105,7 @@ static void
dview_replace_hunk (WDiff * dview, FILE * merge_file, int from1, int to1, int from2, int to2, dview_replace_hunk (WDiff * dview, FILE * merge_file, int from1, int to1, int from2, int to2,
action_direction_t merge_direction) action_direction_t merge_direction)
{ {
int line1 = 0; int line1, line2;
int line2 = 0;
char buf[BUF_10K]; char buf[BUF_10K];
FILE *f0, *f1; FILE *f0, *f1;
@ -2140,12 +2120,9 @@ dview_replace_hunk (WDiff * dview, FILE * merge_file, int from1, int to1, int fr
f1 = fopen (dview->file[DIFF_RIGHT], "r"); f1 = fopen (dview->file[DIFF_RIGHT], "r");
} }
while (fgets (buf, sizeof (buf), f0) != NULL && line1 < from1 - 1) for (line1 = 0; fgets (buf, sizeof (buf), f0) != NULL && line1 < from1 - 1; line1++)
{
line1++;
fputs (buf, merge_file); fputs (buf, merge_file);
} for (line2 = 0; fgets (buf, sizeof (buf), f1) != NULL && line2 <= to2;)
while (fgets (buf, sizeof (buf), f1) != NULL && line2 <= to2)
{ {
line2++; line2++;
if (line2 >= from2) if (line2 >= from2)