commit - b58dfdc420bb51d6027a6dbff55ad2bd1235021c
commit + 72311eba1e091f581f894b17962842d212a0a73a
blob - 8940aa55722190c40c10792ccbc1fee8ca97ec75
blob + f86788bf0db4651a1769f4abf4bbb9c04e11e60d
--- diff_main.h
+++ diff_main.h
@@ -359,18 +359,11 @@ struct diff_input_info {
 	const char *right_path;
 };
 
-enum diff_rc diff_output_plain(FILE *dest, const struct diff_input_info *info,
-			       const struct diff_result *result);
 enum diff_rc diff_plain(FILE *dest, const struct diff_config *diff_config,
 			const struct diff_input_info *info,
 			const char *left, int left_len, const char *right, int right_len);
 
-enum diff_rc diff_output_unidiff(FILE *dest, const struct diff_input_info *info,
-				 const struct diff_result *result, unsigned int context_lines);
 enum diff_rc diff_unidiff(FILE *dest, const struct diff_config *diff_config,
 			  const struct diff_input_info *info,
 			  const char *left, int left_len, const char *right, int right_len,
 			  unsigned int context_lines);
-
-enum diff_rc diff_output_info(FILE *dest, const struct diff_input_info *info);
-void diff_output_lines(FILE *dest, const char *prefix, struct diff_atom *start_atom, unsigned int count);
blob - 3aec65dd78cefe1855aa4b7c3ea83ac3ca96598e
blob + 5e3167a5fa75f9a1133e8672998d6a13e3f37f47
--- diff_output.c
+++ diff_output.c
@@ -16,6 +16,10 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+/*
+ * Common parts for printing diff output
+ */
+
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -24,9 +28,12 @@
 #include "diff_main.h"
 #include "debug.h"
 
-/*
- * Common parts for printing diff output
- */
+enum diff_rc diff_output_plain(FILE *dest, const struct diff_input_info *info,
+			       const struct diff_result *result);
+enum diff_rc diff_output_unidiff(FILE *dest, const struct diff_input_info *info,
+				 const struct diff_result *result, unsigned int context_lines);
+enum diff_rc diff_output_info(FILE *dest, const struct diff_input_info *info);
+void diff_output_lines(FILE *dest, const char *prefix, struct diff_atom *start_atom, unsigned int count);
 
 void
 diff_output_lines(FILE *dest, const char *prefix, struct diff_atom *start_atom,
@@ -120,10 +127,10 @@ diff_plain(FILE *dest, const struct diff_config *diff_
  */
 enum chunk_type {
 	CHUNK_EMPTY,
-	    CHUNK_PLUS,
-	    CHUNK_MINUS,
-	    CHUNK_SAME,
-	    CHUNK_WEIRD,
+	CHUNK_PLUS,
+	CHUNK_MINUS,
+	CHUNK_SAME,
+	CHUNK_WEIRD,
 };
 
 static inline enum chunk_type