undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xdl_diff: identify call sites.

Browse Source 
This inserts a new function xdi_diff() that currently does not
do anything other than calling the underlying xdl_diff() to the
callchain of current callers of xdl_diff() function.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2007-12-13 13:25:07 -08:00
parent 792c1583c8
commit c279d7e986
8 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-blame.c
View File

@ -542,7 +542,7 @@ static struct patch *compare_buffer(mmfile_t *file_p, mmfile_t *file_o,
state.ret->chunks = NULL; state.ret->chunks = NULL;
state.ret->num = 0; state.ret->num = 0;
xdl_diff(file_p, file_o, &xpp, &xecfg, &ecb); xdi_diff(file_p, file_o, &xpp, &xecfg, &ecb);
if (state.ret->num) { if (state.ret->num) {
struct chunk *chunk; struct chunk *chunk;

2
builtin-rerere.c
View File

@ -260,7 +260,7 @@ static int diff_two(const char *file1, const char *label1,
memset(&xecfg, 0, sizeof(xecfg)); memset(&xecfg, 0, sizeof(xecfg));
xecfg.ctxlen = 3; xecfg.ctxlen = 3;
ecb.outf = outf; ecb.outf = outf;
xdl_diff(&minus, &plus, &xpp, &xecfg, &ecb); xdi_diff(&minus, &plus, &xpp, &xecfg, &ecb);
free(minus.ptr); free(minus.ptr);
free(plus.ptr); free(plus.ptr);

2
combine-diff.c
View File

@ -226,7 +226,7 @@ static void combine_diff(const unsigned char *parent, mmfile_t *result_file,
state.num_parent = num_parent; state.num_parent = num_parent;
state.n = n; state.n = n;
xdl_diff(&parent_file, result_file, &xpp, &xecfg, &ecb); xdi_diff(&parent_file, result_file, &xpp, &xecfg, &ecb);
free(parent_file.ptr); free(parent_file.ptr);
/* Assign line numbers for this parent. /* Assign line numbers for this parent.

10
diff.c
View File

@ -439,7 +439,7 @@ static void diff_words_show(struct diff_words_data *diff_words)
ecb.outf = xdiff_outf; ecb.outf = xdiff_outf;
ecb.priv = diff_words; ecb.priv = diff_words;
diff_words->xm.consume = fn_out_diff_words_aux; diff_words->xm.consume = fn_out_diff_words_aux;
xdl_diff(&minus, &plus, &xpp, &xecfg, &ecb); xdi_diff(&minus, &plus, &xpp, &xecfg, &ecb);
free(minus.ptr); free(minus.ptr);
free(plus.ptr); free(plus.ptr);
@ -1393,7 +1393,7 @@ static void builtin_diff(const char *name_a,
if (DIFF_OPT_TST(o, COLOR_DIFF_WORDS)) if (DIFF_OPT_TST(o, COLOR_DIFF_WORDS))
ecbdata.diff_words = ecbdata.diff_words =
xcalloc(1, sizeof(struct diff_words_data)); xcalloc(1, sizeof(struct diff_words_data));
xdl_diff(&mf1, &mf2, &xpp, &xecfg, &ecb); xdi_diff(&mf1, &mf2, &xpp, &xecfg, &ecb);
if (DIFF_OPT_TST(o, COLOR_DIFF_WORDS)) if (DIFF_OPT_TST(o, COLOR_DIFF_WORDS))
free_diff_words_data(&ecbdata); free_diff_words_data(&ecbdata);
} }
@ -1446,7 +1446,7 @@ static void builtin_diffstat(const char *name_a, const char *name_b,
xpp.flags = XDF_NEED_MINIMAL | o->xdl_opts; xpp.flags = XDF_NEED_MINIMAL | o->xdl_opts;
ecb.outf = xdiff_outf; ecb.outf = xdiff_outf;
ecb.priv = diffstat; ecb.priv = diffstat;
xdl_diff(&mf1, &mf2, &xpp, &xecfg, &ecb); xdi_diff(&mf1, &mf2, &xpp, &xecfg, &ecb);
} }
free_and_return: free_and_return:
@ -1486,7 +1486,7 @@ static void builtin_checkdiff(const char *name_a, const char *name_b,
xpp.flags = XDF_NEED_MINIMAL; xpp.flags = XDF_NEED_MINIMAL;
ecb.outf = xdiff_outf; ecb.outf = xdiff_outf;
ecb.priv = &data; ecb.priv = &data;
xdl_diff(&mf1, &mf2, &xpp, &xecfg, &ecb); xdi_diff(&mf1, &mf2, &xpp, &xecfg, &ecb);
} }
free_and_return: free_and_return:
diff_free_filespec_data(one); diff_free_filespec_data(one);
@ -2898,7 +2898,7 @@ static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)
xecfg.flags = XDL_EMIT_FUNCNAMES; xecfg.flags = XDL_EMIT_FUNCNAMES;
ecb.outf = xdiff_outf; ecb.outf = xdiff_outf;
ecb.priv = &data; ecb.priv = &data;
xdl_diff(&mf1, &mf2, &xpp, &xecfg, &ecb); xdi_diff(&mf1, &mf2, &xpp, &xecfg, &ecb);
} }
SHA1_Final(sha1, &ctx); SHA1_Final(sha1, &ctx);

2
merge-file.c
View File

@ -71,7 +71,7 @@ static int generate_common_file(mmfile_t *res, mmfile_t *f1, mmfile_t *f2)
res->size = 0; res->size = 0;
ecb.priv = res; ecb.priv = res;
return xdl_diff(f1, f2, &xpp, &xecfg, &ecb); return xdi_diff(f1, f2, &xpp, &xecfg, &ecb);
} }
void *merge_file(struct blob *base, struct blob *our, struct blob *their, unsigned long *size) void *merge_file(struct blob *base, struct blob *our, struct blob *their, unsigned long *size)

2
merge-tree.c
View File

@ -119,7 +119,7 @@ static void show_diff(struct merge_list *entry)
if (!dst.ptr) if (!dst.ptr)
size = 0; size = 0;
dst.size = size; dst.size = size;
xdl_diff(&src, &dst, &xpp, &xecfg, &ecb); xdi_diff(&src, &dst, &xpp, &xecfg, &ecb);
free(src.ptr); free(src.ptr);
free(dst.ptr); free(dst.ptr);
} }

5
xdiff-interface.c
View File

@ -103,6 +103,11 @@ int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf)
return 0; return 0;
} }
int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *xecb)
{
return xdl_diff(mf1, mf2, xpp, xecfg, xecb);
}
int read_mmfile(mmfile_t *ptr, const char *filename) int read_mmfile(mmfile_t *ptr, const char *filename)
{ {
struct stat st; struct stat st;

1
xdiff-interface.h
View File

@ -13,6 +13,7 @@ struct xdiff_emit_state {
unsigned long remainder_size; unsigned long remainder_size;
}; };
int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb);
int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf); int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf);
int parse_hunk_header(char *line, int len, int parse_hunk_header(char *line, int len,
int *ob, int *on, int *ob, int *on,