Staging
v0.5.1
https://github.com/git/git
Revision ce33288ea6b81a2f4f5aecd72177bcc8174562ae authored by Junio C Hamano on 21 January 2008, 01:04:53 UTC, committed by Junio C Hamano on 21 January 2008, 01:05:11 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 105c21d
Raw File
Tip revision: ce33288ea6b81a2f4f5aecd72177bcc8174562ae authored by Junio C Hamano on 21 January 2008, 01:04:53 UTC
GIT 1.5.4-rc4
Tip revision: ce33288
xdiff-interface.h
#ifndef XDIFF_INTERFACE_H
#define XDIFF_INTERFACE_H

#include "xdiff/xdiff.h"

struct xdiff_emit_state;

typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long);

struct xdiff_emit_state {
	xdiff_emit_consume_fn consume;
	char *remainder;
	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 parse_hunk_header(char *line, int len,
		      int *ob, int *on,
		      int *nb, int *nn);
int read_mmfile(mmfile_t *ptr, const char *filename);
int buffer_is_binary(const char *ptr, unsigned long size);

extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line);

#endif
back to top