git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 06/13] export three functions from diff.c

From
Bo Yang <struggleyb.nku@gmail.com>
Date
Jun 30, 2010, 15:25 UTC
Message-ID
<1277911526-12105-6-git-send-email-struggleyb.nku@gmail.com>
In-Reply-To
<1277911526-12105-1-git-send-email-struggleyb.nku@gmail.com>

Use fill_metainfo to fill the line level diff meta data, emit_line to print out a line and quote_two to quote paths.

Signed-off-by: Bo Yang <struggleyb.nku@gmail.com>
---
 diff.c |    6 +++---
 diff.h |   17 +++++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/diff.c b/diff.c
index 2332fa6..a370a1c 100644
--- a/diff.c
+++ b/diff.c
@@ -144,7 +144,7 @@ int git_diff_basic_config(const char *var, const char *value, void *cb)
 	return git_color_default_config(var, value, cb);
 }
 
-static char *quote_two(const char *one, const char *two)
+char *quote_two(const char *one, const char *two)
 {
 	int need_one = quote_c_style(one, NULL, NULL, 1);
 	int need_two = quote_c_style(two, NULL, NULL, 1);
@@ -325,7 +325,7 @@ static void emit_line_0(struct diff_options *o, const char *set, const char *res
 		fputc('\n', file);
 }
 
-static void emit_line(struct diff_options *o, const char *set, const char *reset,
+void emit_line(struct diff_options *o, const char *set, const char *reset,
 		      const char *line, int len)
 {
 	emit_line_0(o, set, reset, line[0], line+1, len-1);
@@ -2564,7 +2564,7 @@ static int similarity_index(struct diff_filepair *p)
 	return p->score * 100 / MAX_SCORE;
 }
 
-static void fill_metainfo(struct strbuf *msg,
+void fill_metainfo(struct strbuf *msg,
 			  const char *name,
 			  const char *other,
 			  struct diff_filespec *one,
diff --git a/diff.h b/diff.h
index 063d10a..9676ab9 100644
--- a/diff.h
+++ b/diff.h
@@ -12,6 +12,7 @@ struct diff_queue_struct;
 struct strbuf;
 struct diff_filespec;
 struct userdiff_driver;
+struct diff_filepair;
 
 typedef void (*change_fn_t)(struct diff_options *options,
 		 unsigned old_mode, unsigned new_mode,
@@ -301,4 +302,20 @@ extern size_t fill_textconv(struct userdiff_driver *driver,
 
 extern struct userdiff_driver *get_textconv(struct diff_filespec *one);
 
+/* some output functions line.c need */
+extern void fill_metainfo(struct strbuf *msg,
+			  const char *name,
+			  const char *other,
+			  struct diff_filespec *one,
+			  struct diff_filespec *two,
+			  struct diff_options *o,
+			  struct diff_filepair *p,
+			  int *must_show_header,
+			  int use_color);
+
+extern void emit_line(struct diff_options *o, const char *set, const char *reset,
+		      const char *line, int len);
+
+extern char *quote_two(const char *one, const char *two);
+
 #endif /* DIFF_H */
-- 
1.7.0.2.273.gc2413.dirty
Previous: Bo YangNext: Bo Yang
Message 8 of 16 in “parse-options: stop when encounter a non-option”
  1. 01/13 parse-options: stop when encounter a non-optionBo Yang, Jun 30, 2010
  2. 02/13 parse-options: add two helper functionsBo Yang, Jun 30, 2010
  3. 03/13 add the basic data structure for line level historyBo Yang, Jun 30, 2010
  4. Junio C HamanoJul 6, 2010
  5. Bo YangJul 6, 2010
  6. 04/13 refactor parse_locBo Yang, Jun 30, 2010
  7. 05/13 parse the -L optionsBo Yang, Jun 30, 2010
  8. 06/13 export three functions from diff.cBo Yang, Jun 30, 2010
  9. 07/13 add range clone functionsBo Yang, Jun 30, 2010
  10. 08/13 map/take range to parentBo Yang, Jun 30, 2010
  11. 09/13 print the line logBo Yang, Jun 30, 2010
  12. 10/13 map/print ranges along traversing the history topologicallyBo Yang, Jun 30, 2010
  13. 11/13 add --always-print optionBo Yang, Jun 30, 2010
  14. 12/13 add two test casesBo Yang, Jun 30, 2010
  15. 13/13 some document updateBo Yang, Jun 30, 2010
  16. Junio C HamanoJul 6, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.