rename diff_free_filespec_data_large() to diff_free_filespec_blob()
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
eede7b7d11
commit
8ae92e6389
4
diff.c
4
diff.c
@ -1675,7 +1675,7 @@ int diff_populate_filespec(struct diff_filespec *s, int size_only)
|
|||||||
return 0;
|
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)
|
if (s->should_free)
|
||||||
free(s->data);
|
free(s->data);
|
||||||
@ -1690,7 +1690,7 @@ void diff_free_filespec_data_large(struct diff_filespec *s)
|
|||||||
|
|
||||||
void diff_free_filespec_data(struct diff_filespec *s)
|
void diff_free_filespec_data(struct diff_filespec *s)
|
||||||
{
|
{
|
||||||
diff_free_filespec_data_large(s);
|
diff_free_filespec_blob(s);
|
||||||
free(s->cnt_data);
|
free(s->cnt_data);
|
||||||
s->cnt_data = NULL;
|
s->cnt_data = NULL;
|
||||||
}
|
}
|
||||||
|
@ -378,10 +378,10 @@ void diffcore_rename(struct diff_options *options)
|
|||||||
m->score = estimate_similarity(one, two,
|
m->score = estimate_similarity(one, two,
|
||||||
minimum_score);
|
minimum_score);
|
||||||
m->name_score = basename_same(one, two);
|
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 */
|
/* We do not need the text anymore */
|
||||||
diff_free_filespec_data_large(two);
|
diff_free_filespec_blob(two);
|
||||||
dst_cnt++;
|
dst_cnt++;
|
||||||
}
|
}
|
||||||
/* cost matrix sorted by most to least similar pair */
|
/* cost matrix sorted by most to least similar pair */
|
||||||
|
@ -48,7 +48,7 @@ extern void fill_filespec(struct diff_filespec *, const unsigned char *,
|
|||||||
|
|
||||||
extern int diff_populate_filespec(struct diff_filespec *, int);
|
extern int diff_populate_filespec(struct diff_filespec *, int);
|
||||||
extern void diff_free_filespec_data(struct diff_filespec *);
|
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 *);
|
extern int diff_filespec_is_binary(struct diff_filespec *);
|
||||||
|
|
||||||
struct diff_filepair {
|
struct diff_filepair {
|
||||||
|
Loading…
Reference in New Issue
Block a user