X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=xdiff%2Fxutils.h;h=70d8b9838a7333bc5a1edb93cf0e9abdbcf146cc;hb=fe142b3a4577a6692a39e2386ed649664ad8bd20;hp=428a4bb1ef761fa0a61c9e46310c6b5c184b48ab;hpb=65b5e41e24dd76e9cc272399f458857d5b13d63e;p=git.git diff --git a/xdiff/xutils.h b/xdiff/xutils.h index 428a4bb1e..70d8b9838 100644 --- a/xdiff/xutils.h +++ b/xdiff/xutils.h @@ -24,6 +24,8 @@ #define XUTILS_H + +long xdl_bogosqrt(long n); int xdl_emit_diffrec(char const *rec, long size, char const *pre, long psize, xdemitcb_t *ecb); int xdl_cha_init(chastore_t *cha, long isize, long icount); @@ -32,11 +34,13 @@ void *xdl_cha_alloc(chastore_t *cha); void *xdl_cha_first(chastore_t *cha); void *xdl_cha_next(chastore_t *cha); long xdl_guess_lines(mmfile_t *mf); -unsigned long xdl_hash_record(char const **data, char const *top); +int xdl_recmatch(const char *l1, long s1, const char *l2, long s2, long flags); +unsigned long xdl_hash_record(char const **data, char const *top, long flags); unsigned int xdl_hashbits(unsigned int size); int xdl_num_out(char *out, long val); long xdl_atol(char const *str, char const **next); -int xdl_emit_hunk_hdr(long s1, long c1, long s2, long c2, xdemitcb_t *ecb); +int xdl_emit_hunk_hdr(long s1, long c1, long s2, long c2, + const char *func, long funclen, xdemitcb_t *ecb);