summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2007-02-09 22:18:19 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2007-02-09 22:43:02 -0800
commit471efb09aaa266e75e499829fc31a59337ef4a96 (patch)
tree9aea285da42bb0c4fb8ae56e5492acfc65ef25f1
parentwt_status_prepare(): clean up structure initialization. (diff)
downloadtgif-471efb09aaa266e75e499829fc31a59337ef4a96.tar.xz
diff_flush_name(): take struct diff_options parameter.
Among the low-level output functions called from flush_one_pair(), this was the only function that did not take (filepair, options) as arguments. Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--diff.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/diff.c b/diff.c
index ad476f7c68..22be3f77b5 100644
--- a/diff.c
+++ b/diff.c
@@ -2191,13 +2191,13 @@ static void diff_flush_raw(struct diff_filepair *p,
free((void*)path_two);
}
-static void diff_flush_name(struct diff_filepair *p, int line_termination)
+static void diff_flush_name(struct diff_filepair *p, struct diff_options *opt)
{
char *path = p->two->path;
- if (line_termination)
+ if (opt->line_termination)
path = quote_one(p->two->path);
- printf("%s%c", path, line_termination);
+ printf("%s%c", path, opt->line_termination);
if (p->two->path != path)
free(path);
}
@@ -2404,7 +2404,7 @@ static void flush_one_pair(struct diff_filepair *p, struct diff_options *opt)
else if (fmt & (DIFF_FORMAT_RAW | DIFF_FORMAT_NAME_STATUS))
diff_flush_raw(p, opt);
else if (fmt & DIFF_FORMAT_NAME)
- diff_flush_name(p, opt->line_termination);
+ diff_flush_name(p, opt);
}
static void show_file_mode_name(const char *newdelete, struct diff_filespec *fs)