mirror of
https://github.com/git/git.git
synced 2024-05-19 08:16:09 +02:00
5eade0746e
This function was used only for parsing the hunk headers generated by xdiff. Now that we can use hunk callbacks to get that information directly, it has outlived its usefulness. Note to anyone who wants to resurrect it: the "len" parameter was totally unused, meaning that the function could read past the end of the "line" array. In practice this never happened, because we only used it to parse xdiff's generated header lines. But it would be dangerous to use it for other cases without fixing this defect. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
60 lines
2.1 KiB
C
60 lines
2.1 KiB
C
#ifndef XDIFF_INTERFACE_H
|
|
#define XDIFF_INTERFACE_H
|
|
|
|
#include "cache.h"
|
|
#include "xdiff/xdiff.h"
|
|
|
|
/*
|
|
* xdiff isn't equipped to handle content over a gigabyte;
|
|
* we make the cutoff 1GB - 1MB to give some breathing
|
|
* room for constant-sized additions (e.g., merge markers)
|
|
*/
|
|
#define MAX_XDIFF_SIZE (1024UL * 1024 * 1023)
|
|
|
|
typedef void (*xdiff_emit_line_fn)(void *, char *, unsigned long);
|
|
typedef void (*xdiff_emit_hunk_fn)(void *data,
|
|
long old_begin, long old_nr,
|
|
long new_begin, long new_nr,
|
|
const char *func, long funclen);
|
|
|
|
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,
|
|
xdiff_emit_hunk_fn hunk_fn,
|
|
xdiff_emit_line_fn line_fn,
|
|
void *consume_callback_data,
|
|
xpparam_t const *xpp, xdemitconf_t const *xecfg);
|
|
int read_mmfile(mmfile_t *ptr, const char *filename);
|
|
void read_mmblob(mmfile_t *ptr, const struct object_id *oid);
|
|
int buffer_is_binary(const char *ptr, unsigned long size);
|
|
|
|
extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags);
|
|
extern void xdiff_clear_find_func(xdemitconf_t *xecfg);
|
|
extern int git_xmerge_config(const char *var, const char *value, void *cb);
|
|
extern int git_xmerge_style;
|
|
|
|
/*
|
|
* Can be used as a no-op hunk_fn for xdi_diff_outf(), since a NULL
|
|
* one just sends the hunk line to the line_fn callback).
|
|
*/
|
|
void discard_hunk_line(void *priv,
|
|
long ob, long on, long nb, long nn,
|
|
const char *func, long funclen);
|
|
|
|
/*
|
|
* Compare the strings l1 with l2 which are of size s1 and s2 respectively.
|
|
* Returns 1 if the strings are deemed equal, 0 otherwise.
|
|
* The `flags` given as XDF_WHITESPACE_FLAGS determine how white spaces
|
|
* are treated for the comparision.
|
|
*/
|
|
extern int xdiff_compare_lines(const char *l1, long s1,
|
|
const char *l2, long s2, long flags);
|
|
|
|
/*
|
|
* Returns a hash of the string s of length len.
|
|
* The `flags` given as XDF_WHITESPACE_FLAGS determine how white spaces
|
|
* are treated for the hash.
|
|
*/
|
|
extern unsigned long xdiff_hash_string(const char *s, size_t len, long flags);
|
|
|
|
#endif
|