Code

Use strbuf for struct xdiff_emit_state's remainder
[git.git] / xdiff-interface.h
index 6f3b361a845f0f71ece8188e00a3cfa12138edd4..f6a1ec2220512b9aff5c69c4a7f94b0af0dbe3e2 100644 (file)
@@ -2,6 +2,7 @@
 #define XDIFF_INTERFACE_H
 
 #include "xdiff/xdiff.h"
+#include "strbuf.h"
 
 struct xdiff_emit_state;
 
@@ -9,8 +10,7 @@ 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;
+       struct strbuf remainder;
 };
 
 int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb);