git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bo Yang <struggleyb.nku@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com
Subject: [PATCH v3 06/13] export three functions from diff.c
Date: Sun, 11 Jul 2010 14:18:54 +0800	[thread overview]
Message-ID: <1278829141-11900-6-git-send-email-struggleyb.nku@gmail.com> (raw)
In-Reply-To: <1278829141-11900-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 3aa695d..d685f5a 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

  parent reply	other threads:[~2010-07-11  6:21 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-11  6:18 [PATCH v3 01/13] parse-options: stop when encounter a non-option Bo Yang
2010-07-11  6:18 ` [PATCH v3 02/13] parse-options: add two helper functions Bo Yang
2010-07-12 16:45   ` Junio C Hamano
2010-07-11  6:18 ` [PATCH v3 03/13] add the basic data structure for line level history Bo Yang
2010-07-12 14:16   ` Bo Yang
2010-07-12 16:50     ` Junio C Hamano
2010-07-18 14:35       ` Bo Yang
2010-07-11  6:18 ` [PATCH v3 04/13] refactor parse_loc Bo Yang
2010-07-12 18:32   ` Junio C Hamano
2010-07-11  6:18 ` [PATCH v3 05/13] parse the -L options Bo Yang
2010-07-13 23:03   ` Junio C Hamano
2010-07-18 14:49     ` Bo Yang
2010-07-19 18:44       ` Junio C Hamano
2010-07-19 22:48         ` Thomas Rast
2010-07-19 23:53           ` Junio C Hamano
2010-07-20  7:51             ` Thomas Rast
2010-07-20 15:45               ` Junio C Hamano
2010-07-22  9:06                 ` Thomas Rast
2010-07-23  2:08                   ` Junio C Hamano
2010-07-20 15:46               ` Bo Yang
2010-07-20 15:47                 ` Bo Yang
2010-07-11  6:18 ` Bo Yang [this message]
2010-07-11  6:18 ` [PATCH v3 07/13] add range clone functions Bo Yang
2010-07-12 21:52   ` Junio C Hamano
2010-07-11  6:18 ` [PATCH v3 08/13] map/take range to parent Bo Yang
2010-07-12 21:52   ` Junio C Hamano
2010-07-11  6:18 ` [PATCH v3 09/13] print the line log Bo Yang
2010-07-12 21:52   ` Junio C Hamano
2010-07-11  6:18 ` [PATCH v3 10/13] map/print ranges along traversing the history topologically Bo Yang
2010-07-12 21:52   ` Junio C Hamano
2010-07-11  6:18 ` [PATCH v3 11/13] add --always-print option Bo Yang
2010-07-13 20:35   ` Junio C Hamano
2010-07-11  6:19 ` [PATCH v3 12/13] add two test cases Bo Yang
2010-07-11  6:19 ` [PATCH v3 13/13] some document update Bo Yang
2010-07-11  8:27   ` Jakub Narebski
2010-07-12 14:12     ` Bo Yang
2010-07-12 18:45       ` Junio C Hamano
2010-07-18 14:37         ` Bo Yang
2010-07-12 16:45 ` [PATCH v3 01/13] parse-options: stop when encounter a non-option Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1278829141-11900-6-git-send-email-struggleyb.nku@gmail.com \
    --to=struggleyb.nku@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).