Skip to content

Some nit fixups after PR #123 #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
twaugh merged 4 commits into from
Sep 18, 2025
Merged

Some nit fixups after PR #123 #127

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a5aa18b
Remove extra code block from trim_context()
kerneltoast Sep 17, 2025
047f552
Remove unneeded curly braces from if-statement chain in trim_context()
kerneltoast Sep 17, 2025
ef722ee
Remove stray leading spaces in print_color() definition
kerneltoast Sep 17, 2025
5c3dd46
Add printf format attribute to print_color()
kerneltoast Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 16 additions & 19 deletions src/interdiff.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,9 @@ static struct file_list *files_in_patch1 = NULL;
/*
* Print colored output using a variadic format string.
*/
static void
print_color (FILE *output_file, enum line_type type, const char *format, ...)
{
static void __attribute__((__format__(printf, 3, 4)))
print_color (FILE *output_file, enum line_type type, const char *format, ...)
{
const char *color_start = NULL;
va_list args;

Expand All @@ -154,7 +154,7 @@ static struct file_list *files_in_patch1 = NULL;
/* Print color end code */
if (color_start)
fputs ("\033[0m", output_file);
}
}

/* checks whether file needs processing and sets context */
static int
Expand Down Expand Up @@ -1099,21 +1099,18 @@ trim_context (FILE *f /* positioned at start of @@ line */,
printf ("Trim: %lu,%lu\n", strip_pre, strip_post);

fsetpos (f, &pos);
{
if (new_orig_count != 1 && new_new_count != 1) {
print_color (out, LINE_HUNK, "@@ -%lu,%lu +%lu,%lu @@\n",
orig_offset, new_orig_count, new_offset, new_new_count);
} else if (new_orig_count != 1) {
print_color (out, LINE_HUNK, "@@ -%lu,%lu +%lu @@\n",
orig_offset, new_orig_count, new_offset);
} else if (new_new_count != 1) {
print_color (out, LINE_HUNK, "@@ -%lu +%lu,%lu @@\n",
orig_offset, new_offset, new_new_count);
} else {
print_color (out, LINE_HUNK, "@@ -%lu +%lu @@\n",
orig_offset, new_offset);
}
}
if (new_orig_count != 1 && new_new_count != 1)
print_color (out, LINE_HUNK, "@@ -%lu,%lu +%lu,%lu @@\n",
orig_offset, new_orig_count, new_offset, new_new_count);
else if (new_orig_count != 1)
print_color (out, LINE_HUNK, "@@ -%lu,%lu +%lu @@\n",
orig_offset, new_orig_count, new_offset);
else if (new_new_count != 1)
print_color (out, LINE_HUNK, "@@ -%lu +%lu,%lu @@\n",
orig_offset, new_offset, new_new_count);
else
print_color (out, LINE_HUNK, "@@ -%lu +%lu @@\n",
orig_offset, new_offset);

while (total_count--) {
enum line_type type;
Expand Down