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

xdiff-interface: hide the whole "xdiff_emit_state" business from the caller

Browse Source 
This further enhances xdi_diff_outf() interface so that it takes two
common parameters: the callback function that processes one line at a
time, and a pointer to its application specific callback data structure.
xdi_diff_outf() creates its own "xdiff_emit_state" structure and stashes
these two away inside it, which is used by the lowest level output
function in the xdiff_outf() callchain, consume_one(), to call back to the
application layer.  With this restructuring, we lift the requirement that
the caller supplied callback data structure embeds xdiff_emit_state
structure as its first member.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2008-08-13 23:18:22 -07:00
parent b463776086
commit 8a3f524bf2
5 changed files with 33 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin-blame.c
View File

@ -465,7 +465,6 @@ struct patch {
}; };
struct blame_diff_state { struct blame_diff_state {
struct xdiff_emit_state xm;
struct patch *ret; struct patch *ret;
unsigned hunk_post_context; unsigned hunk_post_context;
unsigned hunk_in_pre_context : 1; unsigned hunk_in_pre_context : 1;
@ -529,12 +528,11 @@ static struct patch *compare_buffer(mmfile_t *file_p, mmfile_t *file_o,
memset(&xecfg, 0, sizeof(xecfg)); memset(&xecfg, 0, sizeof(xecfg));
xecfg.ctxlen = context; xecfg.ctxlen = context;
memset(&state, 0, sizeof(state)); memset(&state, 0, sizeof(state));
state.xm.consume = process_u_diff;
state.ret = xmalloc(sizeof(struct patch)); state.ret = xmalloc(sizeof(struct patch));
state.ret->chunks = NULL; state.ret->chunks = NULL;
state.ret->num = 0; state.ret->num = 0;
xdi_diff_outf(file_p, file_o, &state.xm, &xpp, &xecfg, &ecb); xdi_diff_outf(file_p, file_o, process_u_diff, &state, &xpp, &xecfg, &ecb);
if (state.ret->num) { if (state.ret->num) {
struct chunk *chunk; struct chunk *chunk;

7
combine-diff.c
View File

@ -143,8 +143,6 @@ static void append_lost(struct sline *sline, int n, const char *line, int len)
} }
struct combine_diff_state { struct combine_diff_state {
struct xdiff_emit_state xm;
unsigned int lno; unsigned int lno;
int ob, on, nb, nn; int ob, on, nb, nn;
unsigned long nmask; unsigned long nmask;
@ -218,15 +216,14 @@ static void combine_diff(const unsigned char *parent, mmfile_t *result_file,
xpp.flags = XDF_NEED_MINIMAL; xpp.flags = XDF_NEED_MINIMAL;
memset(&xecfg, 0, sizeof(xecfg)); memset(&xecfg, 0, sizeof(xecfg));
memset(&state, 0, sizeof(state)); memset(&state, 0, sizeof(state));
state.xm.consume = consume_line;
state.nmask = nmask; state.nmask = nmask;
state.sline = sline; state.sline = sline;
state.lno = 1; state.lno = 1;
state.num_parent = num_parent; state.num_parent = num_parent;
state.n = n; state.n = n;
xdi_diff_outf(&parent_file, result_file, xdi_diff_outf(&parent_file, result_file, consume_line, &state,
&state.xm, &xpp, &xecfg, &ecb); &xpp, &xecfg, &ecb);
free(parent_file.ptr); free(parent_file.ptr);
/* Assign line numbers for this parent. /* Assign line numbers for this parent.

27
diff.c
View File

@ -369,7 +369,6 @@ static void diff_words_append(char *line, unsigned long len,
} }
struct diff_words_data { struct diff_words_data {
struct xdiff_emit_state xm;
struct diff_words_buffer minus, plus; struct diff_words_buffer minus, plus;
FILE *file; FILE *file;
}; };
@ -459,9 +458,8 @@ static void diff_words_show(struct diff_words_data *diff_words)
xpp.flags = XDF_NEED_MINIMAL; xpp.flags = XDF_NEED_MINIMAL;
xecfg.ctxlen = diff_words->minus.alloc + diff_words->plus.alloc; xecfg.ctxlen = diff_words->minus.alloc + diff_words->plus.alloc;
diff_words->xm.consume = fn_out_diff_words_aux; xdi_diff_outf(&minus, &plus, fn_out_diff_words_aux, diff_words,
xdi_diff_outf(&minus, &plus, &diff_words->xm, &xpp, &xecfg, &ecb); &xpp, &xecfg, &ecb);
free(minus.ptr); free(minus.ptr);
free(plus.ptr); free(plus.ptr);
diff_words->minus.text.size = diff_words->plus.text.size = 0; diff_words->minus.text.size = diff_words->plus.text.size = 0;
@ -475,7 +473,6 @@ static void diff_words_show(struct diff_words_data *diff_words)
typedef unsigned long (*sane_truncate_fn)(char *line, unsigned long len); typedef unsigned long (*sane_truncate_fn)(char *line, unsigned long len);
struct emit_callback { struct emit_callback {
struct xdiff_emit_state xm;
int nparents, color_diff; int nparents, color_diff;
unsigned ws_rule; unsigned ws_rule;
sane_truncate_fn truncate; sane_truncate_fn truncate;
@ -706,8 +703,6 @@ static char *pprint_rename(const char *a, const char *b)
} }
struct diffstat_t { struct diffstat_t {
struct xdiff_emit_state xm;
int nr; int nr;
int alloc; int alloc;
struct diffstat_file { struct diffstat_file {
@ -1129,7 +1124,6 @@ static void free_diffstat_info(struct diffstat_t *diffstat)
} }
struct checkdiff_t { struct checkdiff_t {
struct xdiff_emit_state xm;
const char *filename; const char *filename;
int lineno; int lineno;
struct diff_options *o; struct diff_options *o;
@ -1519,13 +1513,13 @@ static void builtin_diff(const char *name_a,
xecfg.ctxlen = strtoul(diffopts + 10, NULL, 10); xecfg.ctxlen = strtoul(diffopts + 10, NULL, 10);
else if (!prefixcmp(diffopts, "-u")) else if (!prefixcmp(diffopts, "-u"))
xecfg.ctxlen = strtoul(diffopts + 2, NULL, 10); xecfg.ctxlen = strtoul(diffopts + 2, NULL, 10);
ecbdata.xm.consume = fn_out_consume;
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));
ecbdata.diff_words->file = o->file; ecbdata.diff_words->file = o->file;
} }
xdi_diff_outf(&mf1, &mf2, &ecbdata.xm, &xpp, &xecfg, &ecb); xdi_diff_outf(&mf1, &mf2, fn_out_consume, &ecbdata,
&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);
} }
@ -1576,7 +1570,8 @@ static void builtin_diffstat(const char *name_a, const char *name_b,
memset(&xecfg, 0, sizeof(xecfg)); memset(&xecfg, 0, sizeof(xecfg));
xpp.flags = XDF_NEED_MINIMAL | o->xdl_opts; xpp.flags = XDF_NEED_MINIMAL | o->xdl_opts;
xdi_diff_outf(&mf1, &mf2, &diffstat->xm, &xpp, &xecfg, &ecb); xdi_diff_outf(&mf1, &mf2, diffstat_consume, diffstat,
&xpp, &xecfg, &ecb);
} }
free_and_return: free_and_return:
@ -1597,7 +1592,6 @@ static void builtin_checkdiff(const char *name_a, const char *name_b,
return; return;
memset(&data, 0, sizeof(data)); memset(&data, 0, sizeof(data));
data.xm.consume = checkdiff_consume;
data.filename = name_b ? name_b : name_a; data.filename = name_b ? name_b : name_a;
data.lineno = 0; data.lineno = 0;
data.o = o; data.o = o;
@ -1622,7 +1616,8 @@ static void builtin_checkdiff(const char *name_a, const char *name_b,
memset(&xecfg, 0, sizeof(xecfg)); memset(&xecfg, 0, sizeof(xecfg));
xpp.flags = XDF_NEED_MINIMAL; xpp.flags = XDF_NEED_MINIMAL;
xdi_diff_outf(&mf1, &mf2, &data.xm, &xpp, &xecfg, &ecb); xdi_diff_outf(&mf1, &mf2, checkdiff_consume, &data,
&xpp, &xecfg, &ecb);
if ((data.ws_rule & WS_TRAILING_SPACE) && if ((data.ws_rule & WS_TRAILING_SPACE) &&
data.trailing_blanks_start) { data.trailing_blanks_start) {
@ -3010,7 +3005,6 @@ static void diff_summary(FILE *file, struct diff_filepair *p)
} }
struct patch_id_t { struct patch_id_t {
struct xdiff_emit_state xm;
SHA_CTX *ctx; SHA_CTX *ctx;
int patchlen; int patchlen;
}; };
@ -3055,7 +3049,6 @@ static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)
SHA1_Init(&ctx); SHA1_Init(&ctx);
memset(&data, 0, sizeof(struct patch_id_t)); memset(&data, 0, sizeof(struct patch_id_t));
data.ctx = &ctx; data.ctx = &ctx;
data.xm.consume = patch_id_consume;
for (i = 0; i < q->nr; i++) { for (i = 0; i < q->nr; i++) {
xpparam_t xpp; xpparam_t xpp;
@ -3120,7 +3113,8 @@ static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)
xpp.flags = XDF_NEED_MINIMAL; xpp.flags = XDF_NEED_MINIMAL;
xecfg.ctxlen = 3; xecfg.ctxlen = 3;
xecfg.flags = XDL_EMIT_FUNCNAMES; xecfg.flags = XDL_EMIT_FUNCNAMES;
xdi_diff_outf(&mf1, &mf2, &data.xm, &xpp, &xecfg, &ecb); xdi_diff_outf(&mf1, &mf2, patch_id_consume, &data,
&xpp, &xecfg, &ecb);
} }
SHA1_Final(sha1, &ctx); SHA1_Final(sha1, &ctx);
@ -3197,7 +3191,6 @@ void diff_flush(struct diff_options *options)
struct diffstat_t diffstat; struct diffstat_t diffstat;
memset(&diffstat, 0, sizeof(struct diffstat_t)); memset(&diffstat, 0, sizeof(struct diffstat_t));
diffstat.xm.consume = diffstat_consume;
for (i = 0; i < q->nr; i++) { for (i = 0; i < q->nr; i++) {
struct diff_filepair *p = q->queue[i]; struct diff_filepair *p = q->queue[i];
if (check_pair_status(p)) if (check_pair_status(p))

23
xdiff-interface.c
View File

@ -1,5 +1,12 @@
#include "cache.h" #include "cache.h"
#include "xdiff-interface.h" #include "xdiff-interface.h"
#include "strbuf.h"
struct xdiff_emit_state {
xdiff_emit_consume_fn consume;
void *consume_callback_data;
struct strbuf remainder;
};
static int parse_num(char **cp_p, int *num_p) static int parse_num(char **cp_p, int *num_p)
{ {
@ -55,7 +62,7 @@ static void consume_one(void *priv_, char *s, unsigned long size)
unsigned long this_size; unsigned long this_size;
ep = memchr(s, '\n', size); ep = memchr(s, '\n', size);
this_size = (ep == NULL) ? size : (ep - s + 1); this_size = (ep == NULL) ? size : (ep - s + 1);
priv->consume(priv, s, this_size); priv->consume(priv->consume_callback_data, s, this_size);
size -= this_size; size -= this_size;
s += this_size; s += this_size;
} }
@ -128,15 +135,21 @@ int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t co
} }
int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2, int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2,
struct xdiff_emit_state *state, xpparam_t const *xpp, xdiff_emit_consume_fn fn, void *consume_callback_data,
xpparam_t const *xpp,
xdemitconf_t const *xecfg, xdemitcb_t *xecb) xdemitconf_t const *xecfg, xdemitcb_t *xecb)
{ {
int ret; int ret;
struct xdiff_emit_state state;
memset(&state, 0, sizeof(state));
state.consume = fn;
state.consume_callback_data = consume_callback_data;
xecb->outf = xdiff_outf; xecb->outf = xdiff_outf;
xecb->priv = state; xecb->priv = &state;
strbuf_init(&state->remainder, 0); strbuf_init(&state.remainder, 0);
ret = xdi_diff(mf1, mf2, xpp, xecfg, xecb); ret = xdi_diff(mf1, mf2, xpp, xecfg, xecb);
strbuf_release(&state->remainder); strbuf_release(&state.remainder);
return ret; return ret;
} }

11
xdiff-interface.h
View File

@ -2,20 +2,13 @@
#define XDIFF_INTERFACE_H #define XDIFF_INTERFACE_H
#include "xdiff/xdiff.h" #include "xdiff/xdiff.h"
#include "strbuf.h"
struct xdiff_emit_state;
typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long); typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long);
struct xdiff_emit_state {
xdiff_emit_consume_fn consume;
struct strbuf remainder;
};
int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb); int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb);
int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2, int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2,
struct xdiff_emit_state *state, xpparam_t const *xpp, xdiff_emit_consume_fn fn, void *consume_callback_data,
xpparam_t const *xpp,
xdemitconf_t const *xecfg, xdemitcb_t *xecb); xdemitconf_t const *xecfg, xdemitcb_t *xecb);
int parse_hunk_header(char *line, int len, int parse_hunk_header(char *line, int len,
int *ob, int *on, int *ob, int *on,