Merge pull request libgit2#6223 from libgit2/ethomson/xdiff

ethomson · web-flow · commit 899fd4c5e2d4 · 2022-02-18T09:30:05.000-05:00
xdiff: use xdl_free not free
diff --git a/src/xdiff/xdiff.h b/src/xdiff/xdiff.h
@@ -23,12 +23,12 @@
 #if !defined(XDIFF_H)
 #define XDIFF_H
 
-#include "git-xdiff.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* #ifdef __cplusplus */
 
+#include "git-xdiff.h"
+
 /* xpparm_t.flags */
 #define XDF_NEED_MINIMAL (1 << 0)
 
diff --git a/src/xdiff/xmerge.c b/src/xdiff/xmerge.c
@@ -88,7 +88,7 @@ static int xdl_cleanup_merge(xdmerge_t *c)
 		if (c->mode == 0)
 			count++;
 		next_c = c->next;
-		free(c);
+		xdl_free(c);
 	}
 	return count;
 }
@@ -456,7 +456,7 @@ static void xdl_merge_two_conflicts(xdmerge_t *m)
 	m->chg1 = next_m->i1 + next_m->chg1 - m->i1;
 	m->chg2 = next_m->i2 + next_m->chg2 - m->i2;
 	m->next = next_m->next;
-	free(next_m);
+	xdl_free(next_m);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ static int xdl_cleanup_merge(xdmerge_t *c)`
`88`	`88`	`if (c->mode == 0)`
`89`	`89`	`count++;`
`90`	`90`	`next_c = c->next;`
`91`		`- free(c);`
	`91`	`+ xdl_free(c);`
`92`	`92`	`}`
`93`	`93`	`return count;`
`94`	`94`	`}`
`@@ -456,7 +456,7 @@ static void xdl_merge_two_conflicts(xdmerge_t *m)`
`456`	`456`	`m->chg1 = next_m->i1 + next_m->chg1 - m->i1;`
`457`	`457`	`m->chg2 = next_m->i2 + next_m->chg2 - m->i2;`
`458`	`458`	`m->next = next_m->next;`
`459`		`- free(next_m);`
	`459`	`+ xdl_free(next_m);`
`460`	`460`	`}`
`461`	`461`
`462`	`462`	`/*`