summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-04-09 06:30:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-04-09 06:30:49 (GMT)
commitaed6ca52e73a35d0aac9aba7d631e09983e46a6f (patch)
treee1c4f570011917fc341809d51ae0f87795eb7c78 /diff.c
parentb76c056b95ccb15ae3b0723da983914de88b4bae (diff)
downloadgit-aed6ca52e73a35d0aac9aba7d631e09983e46a6f.zip
git-aed6ca52e73a35d0aac9aba7d631e09983e46a6f.tar.gz
git-aed6ca52e73a35d0aac9aba7d631e09983e46a6f.tar.bz2
diff.c: work around pointer constness warnings
The textconv leak fix introduced two invocations of free() to release memory pointed by "const char *", which get annoying compiler warning.
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/diff.c b/diff.c
index db2cd5d..c23093d 100644
--- a/diff.c
+++ b/diff.c
@@ -551,9 +551,9 @@ static void emit_rewrite_diff(const char *name_a,
if (lc_b)
emit_rewrite_lines(&ecbdata, '+', data_two, size_two);
if (textconv_one)
- free(data_one);
+ free((char *)data_one);
if (textconv_two)
- free(data_two);
+ free((char *)data_two);
}
struct diff_words_buffer {