Re: [PATCHv2 1/2] Make xdi_diff_outf interface for running xdiff_outf diffs
- From
Brian Downing <bdowning@lavos.net>
- Date
- Aug 14, 2008, 05:31 UTC
- Message-ID
- <20080814053156.GE4396@lavos.net>
- 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:
Show 12 quoted lines
> @@ -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.
Show 6 quoted lines
> + return ret;
> +}
> +
> int read_mmfile(mmfile_t *ptr, const char *filename)
> {
> struct stat st;-bcd