From: bdowning@lavos•net (Brian Downing)
To: Junio C Hamano <gitster@pobox•com>
Cc: git@vger•kernel.org
Subject: Re: [PATCHv2 1/2] Make xdi_diff_outf interface for running xdiff_outf diffs
Date: Thu, 14 Aug 2008 00:31:58 -0500 [thread overview]
Message-ID: <20080814053156.GE4396@lavos.net> (raw)
In-Reply-To: <1218690802-30536-1-git-send-email-bdowning@lavos.net>
On Thu, Aug 14, 2008 at 12:13:21AM -0500, Brian Downing wrote:
> @@ -141,6 +141,17 @@ int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t co
> return xdl_diff(&a, &b, xpp, xecfg, xecb);
> }
>
> +int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2,
> + struct xdiff_emit_state *state, xpparam_t const *xpp,
> + xdemitconf_t const *xecfg, xdemitcb_t *xecb)
> +{
> + int ret;
> + xecb->outf = xdiff_outf;
> + xecb->priv = state;
> + ret = xdl_diff(mf1, mf2, xpp, xecfg, xecb);
Sorry, this was wrong. It should call xdi_diff. (Unfortunately, the
tests passed anyway.) I'll resubmit.
> + return ret;
> +}
> +
> int read_mmfile(mmfile_t *ptr, const char *filename)
> {
> struct stat st;
-bcd
next prev parent reply other threads:[~2008-08-14 5:33 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-13 7:05 [PATCH 1/2] Make xdiff_outf_{init,release} interface Brian Downing
2008-08-14 0:46 ` Junio C Hamano
2008-08-14 2:06 ` Brian Downing
2008-08-14 2:13 ` Junio C Hamano
2008-08-14 5:13 ` [PATCHv2 1/2] Make xdi_diff_outf interface for running xdiff_outf diffs Brian Downing
2008-08-14 5:13 ` [PATCHv2 2/2] Use strbuf for struct xdiff_emit_state's remainder Brian Downing
2008-08-14 5:31 ` Brian Downing [this message]
2008-08-14 5:36 ` [PATCHv3 1/2] Make xdi_diff_outf interface for running xdiff_outf diffs Brian Downing
2008-08-14 5:36 ` [PATCHv3 2/2] Use strbuf for struct xdiff_emit_state's remainder Brian Downing
2008-08-14 6:18 ` [PATCHv3 1/2] Make xdi_diff_outf interface for running xdiff_outf diffs Junio C Hamano
2008-08-14 6:34 ` Brian Downing
2008-08-21 3:37 ` Brian Downing
2008-08-21 5:24 ` Junio C Hamano
2008-08-21 6:29 ` Brian Downing
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=20080814053156.GE4396@lavos.net \
--to=bdowning@lavos$(echo .)net \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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