From e68b6f1525c670f474d735009fec419473df0962 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 14 Jul 2005 17:59:17 -0700 Subject: Split up "diff_format" into "format" and "line_termination". This removes the separate "formats" for name and name-with-zero- termination. It also removes the difference between HUMAN and MACHINE formats, and they both become DIFF_FORMAT_RAW, with the difference being just in the line and inter-filename termination. It also makes the code easier to understand. --- diff.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'diff.h') diff --git a/diff.h b/diff.h index 9f9ca8be5b..e0a3207a62 100644 --- a/diff.h +++ b/diff.h @@ -75,13 +75,11 @@ extern void diffcore_std_no_resolve(const char **paths, extern int diff_queue_is_empty(void); -#define DIFF_FORMAT_HUMAN 0 -#define DIFF_FORMAT_MACHINE 1 +#define DIFF_FORMAT_RAW 1 #define DIFF_FORMAT_PATCH 2 #define DIFF_FORMAT_NO_OUTPUT 3 #define DIFF_FORMAT_NAME 4 -#define DIFF_FORMAT_NAME_Z 5 -extern void diff_flush(int output_style); +extern void diff_flush(int output_style, int line_terminator); #endif /* DIFF_H */ -- cgit v1.2.3