Skip to content

G
git2
Unverified Commit 899fd4c5 by Edward Thomson Committed by GitHub
Options

Merge pull request #6223 from libgit2/ethomson/xdiff 

xdiff: use xdl_free not free
parents 1afad26e b722c45d
Showing with 4 additions and 4 deletions
src/xdiff/xdiff.h
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
#if !defined(XDIFF_H) #if !defined(XDIFF_H)
#define XDIFF_H #define XDIFF_H
#include "git-xdiff.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* #ifdef __cplusplus */ #endif /* #ifdef __cplusplus */
#include "git-xdiff.h"
/* xpparm_t.flags */ /* xpparm_t.flags */
#define XDF_NEED_MINIMAL (1 << 0) #define XDF_NEED_MINIMAL (1 << 0)
......
src/xdiff/xmerge.c
...@@ -88,7 +88,7 @@ static int xdl_cleanup_merge(xdmerge_t *c) ...@@ -88,7 +88,7 @@ static int xdl_cleanup_merge(xdmerge_t *c)
if (c->mode == 0) if (c->mode == 0)
count++; count++;
next_c = c->next; next_c = c->next;
free(c); xdl_free(c);
} }
return count; return count;
} }
...@@ -456,7 +456,7 @@ static void xdl_merge_two_conflicts(xdmerge_t *m) ...@@ -456,7 +456,7 @@ static void xdl_merge_two_conflicts(xdmerge_t *m)
m->chg1 = next_m->i1 + next_m->chg1 - m->i1; m->chg1 = next_m->i1 + next_m->chg1 - m->i1;
m->chg2 = next_m->i2 + next_m->chg2 - m->i2; m->chg2 = next_m->i2 + next_m->chg2 - m->i2;
m->next = next_m->next; m->next = next_m->next;
free(next_m); xdl_free(next_m);
} }
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment