mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tk/diffcore-delta-remove-unused' into maint

Browse Source 
Code cleanup.

* tk/diffcore-delta-remove-unused:
  diffcore-delta: remove unused parameter to diffcore_count_changes()
This commit is contained in:
Junio C Hamano
2016-11-29 13:28:03 -08:00
parent af8d6a9821 974e0044d6
commit 0a79ccaac7
5 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
diff.c
View File

@ -1954,7 +1954,7 @@ static void show_dirstat(struct diff_options *options)
if (DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) { if (DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
diff_populate_filespec(p->one, 0); diff_populate_filespec(p->one, 0);
diff_populate_filespec(p->two, 0); diff_populate_filespec(p->two, 0);
diffcore_count_changes(p->one, p->two, NULL, NULL, 0, diffcore_count_changes(p->one, p->two, NULL, NULL,
&copied, &added); &copied, &added);
diff_free_filespec_data(p->one); diff_free_filespec_data(p->one);
diff_free_filespec_data(p->two); diff_free_filespec_data(p->two);

1
diffcore-break.c
View File

@ -73,7 +73,6 @@ static int should_break(struct diff_filespec *src,
if (diffcore_count_changes(src, dst, if (diffcore_count_changes(src, dst,
&src->cnt_data, &dst->cnt_data, &src->cnt_data, &dst->cnt_data,
0,
&src_copied, &literal_added)) &src_copied, &literal_added))
return 0; return 0;

1
diffcore-delta.c
View File

@ -169,7 +169,6 @@ int diffcore_count_changes(struct diff_filespec *src,
struct diff_filespec *dst, struct diff_filespec *dst,
void **src_count_p, void **src_count_p,
void **dst_count_p, void **dst_count_p,
unsigned long delta_limit,
unsigned long *src_copied, unsigned long *src_copied,
unsigned long *literal_added) unsigned long *literal_added)
{ {

4
diffcore-rename.c
View File

@ -145,7 +145,6 @@ static int estimate_similarity(struct diff_filespec *src,
* call into this function in that case. * call into this function in that case.
*/ */
unsigned long max_size, delta_size, base_size, src_copied, literal_added; unsigned long max_size, delta_size, base_size, src_copied, literal_added;
unsigned long delta_limit;
int score; int score;
/* We deal only with regular files. Symlink renames are handled /* We deal only with regular files. Symlink renames are handled
@ -191,11 +190,8 @@ static int estimate_similarity(struct diff_filespec *src,
if (!dst->cnt_data && diff_populate_filespec(dst, 0)) if (!dst->cnt_data && diff_populate_filespec(dst, 0))
return 0; return 0;
delta_limit = (unsigned long)
(base_size * (MAX_SCORE-minimum_score) / MAX_SCORE);
if (diffcore_count_changes(src, dst, if (diffcore_count_changes(src, dst,
&src->cnt_data, &dst->cnt_data, &src->cnt_data, &dst->cnt_data,
delta_limit,
&src_copied, &literal_added)) &src_copied, &literal_added))
return 0; return 0;

1
diffcore.h
View File

@ -142,7 +142,6 @@ extern int diffcore_count_changes(struct diff_filespec *src,
struct diff_filespec *dst, struct diff_filespec *dst,
void **src_count_p, void **src_count_p,
void **dst_count_p, void **dst_count_p,
unsigned long delta_limit,
unsigned long *src_copied, unsigned long *src_copied,
unsigned long *literal_added); unsigned long *literal_added);