Allow alternate "low-level" emit function from xdl_diff
For some users (e.g. git blame), getting textual patch output is just extra work, as they can get all the information they need from the low- level diff structures. Allow for an alternate low-level emit function to be defined to allow bypassing the textual patch generation; set xemitconf_t's emit_func member to enable this. The (void (*)()) type is pretty ugly, but the alternative would be to include most of the private xdiff headers in xdiff.h to get the types required for the "proper" function prototype. Also, a (void *) won't work, as ANSI C doesn't allow a function pointer to be cast to an object pointer. Signed-off-by: Brian Downing <bdowning@lavos.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brian Downing committed
Oct 25, 2008 at 15:30 UTC
ef2e62fe23173586f49a00c6ae953ebbdb0d13ab
4 files changed
+8
-3
xdiff/xdiff.h
+1
@@ -87,6 +87,7 @@ typedef struct s_xdemitconf {
87
unsigned long flags;
88
find_func_t find_func;
89
void *find_func_priv;
90
+ void (*emit_func)();
91
} xdemitconf_t;
92
93
typedef struct s_bdiffparam {
xdiff/xdiffi.c
+3
-1
@@ -538,6 +538,8 @@ int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
538
xdemitconf_t const *xecfg, xdemitcb_t *ecb) {
539
xdchange_t *xscr;
540
xdfenv_t xe;
541
+ emit_func_t ef = xecfg->emit_func ?
542
+ (emit_func_t)xecfg->emit_func : xdl_emit_diff;
543
544
if (xdl_do_diff(mf1, mf2, xpp, &xe) < 0) {
545
@@ -551,7 +553,7 @@ int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
553
return -1;
554
}
555
if (xscr) {
554
- if (xdl_emit_diff(&xe, xscr, ecb, xecfg) < 0) {
556
+ if (ef(&xe, xscr, ecb, xecfg) < 0) {
557
558
xdl_free_script(xscr);
559
xdl_free_env(&xe);
xdiff/xemit.c
+1
-2
@@ -27,7 +27,6 @@
27
28
static long xdl_get_rec(xdfile_t *xdf, long ri, char const **rec);
29
static int xdl_emit_record(xdfile_t *xdf, long ri, char const *pre, xdemitcb_t *ecb);
30
-static xdchange_t *xdl_get_hunk(xdchange_t *xscr, xdemitconf_t const *xecfg);
30
31
32
@@ -58,7 +57,7 @@ static int xdl_emit_record(xdfile_t *xdf, long ri, char const *pre, xdemitcb_t *
57
* Starting at the passed change atom, find the latest change atom to be included
58
* inside the differential hunk according to the specified configuration.
59
*/
61
-static xdchange_t *xdl_get_hunk(xdchange_t *xscr, xdemitconf_t const *xecfg) {
60
+xdchange_t *xdl_get_hunk(xdchange_t *xscr, xdemitconf_t const *xecfg) {
61
xdchange_t *xch, *xchp;
62
63
for (xchp = xscr, xch = xscr->next; xch; xchp = xch, xch = xch->next)
xdiff/xemit.h
+3
@@ -24,7 +24,10 @@
24
#define XEMIT_H
25
26
27
+typedef int (*emit_func_t)(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
28
+ xdemitconf_t const *xecfg);
29
30
+xdchange_t *xdl_get_hunk(xdchange_t *xscr, xdemitconf_t const *xecfg);
31
int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
32
xdemitconf_t const *xecfg);
33