summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: eede7b7)
raw | patch | inline | side by side (parent: eede7b7)
author | Junio C Hamano <gitster@pobox.com> | |
Wed, 3 Oct 2007 04:01:03 +0000 (21:01 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 3 Oct 2007 04:02:09 +0000 (21:02 -0700) |
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff.c | patch | blob | history | |
diffcore-rename.c | patch | blob | history | |
diffcore.h | patch | blob | history |
index 35e3c619864809a46cd5b6a36d08e8103b5ce485..71b340c5368fb287ce7d7b242aa51436ed5dda93 100644 (file)
--- a/diff.c
+++ b/diff.c
return 0;
}
-void diff_free_filespec_data_large(struct diff_filespec *s)
+void diff_free_filespec_blob(struct diff_filespec *s)
{
if (s->should_free)
free(s->data);
void diff_free_filespec_data(struct diff_filespec *s)
{
- diff_free_filespec_data_large(s);
+ diff_free_filespec_blob(s);
free(s->cnt_data);
s->cnt_data = NULL;
}
diff --git a/diffcore-rename.c b/diffcore-rename.c
index 4fc200064ae655c6936828c6bf04234afde778ce..142e5376dd741377c311075816f139a0949ee82f 100644 (file)
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
m->score = estimate_similarity(one, two,
minimum_score);
m->name_score = basename_same(one, two);
- diff_free_filespec_data_large(one);
+ diff_free_filespec_blob(one);
}
/* We do not need the text anymore */
- diff_free_filespec_data_large(two);
+ diff_free_filespec_blob(two);
dst_cnt++;
}
/* cost matrix sorted by most to least similar pair */
diff --git a/diffcore.h b/diffcore.h
index 4bf175bda99f51f8df1445349d87bc59b56095e7..eb618b1ec00113dabcd5231f141f82e1cdfdca46 100644 (file)
--- a/diffcore.h
+++ b/diffcore.h
extern int diff_populate_filespec(struct diff_filespec *, int);
extern void diff_free_filespec_data(struct diff_filespec *);
-extern void diff_free_filespec_data_large(struct diff_filespec *);
+extern void diff_free_filespec_blob(struct diff_filespec *);
extern int diff_filespec_is_binary(struct diff_filespec *);
struct diff_filepair {