diffcore_count_changes: pass diffcore_filespec
We may want to use richer information on the data we are dealing with in this function, so instead of passing a buffer address and length, just pass the diffcore_filespec structure. Existing callers always call this function with parameters taken from a filespec anyway, so there is no functionality changes. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jun 28, 2007 at 22:54 UTC
d8c3d03a0b7f10977dd508a5a965a417b7f1b065
4 files changed
+8
-10
diffcore-break.c
+1
-2
@@ -66,8 +66,7 @@ static int should_break(struct diff_filespec *src,
66
if (base_size < MINIMUM_BREAK_SIZE)
67
return 0; /* we do not break too small filepair */
68
69
- if (diffcore_count_changes(src->data, src->size,
70
- dst->data, dst->size,
69
+ if (diffcore_count_changes(src, dst,
70
NULL, NULL,
71
0,
72
&src_copied, &literal_added))
diffcore-delta.c
+4
-4
@@ -156,8 +156,8 @@ static struct spanhash_top *hash_chars(unsigned char *buf, unsigned int sz)
156
return hash;
157
}
158
159
-int diffcore_count_changes(void *src, unsigned long src_size,
160
- void *dst, unsigned long dst_size,
159
+int diffcore_count_changes(struct diff_filespec *src,
160
+ struct diff_filespec *dst,
161
void **src_count_p,
162
void **dst_count_p,
163
unsigned long delta_limit,
@@ -172,14 +172,14 @@ int diffcore_count_changes(void *src, unsigned long src_size,
172
if (src_count_p)
173
src_count = *src_count_p;
174
if (!src_count) {
175
- src_count = hash_chars(src, src_size);
175
+ src_count = hash_chars(src->data, src->size);
176
if (src_count_p)
177
*src_count_p = src_count;
178
}
179
if (dst_count_p)
180
dst_count = *dst_count_p;
181
if (!dst_count) {
182
- dst_count = hash_chars(dst, dst_size);
182
+ dst_count = hash_chars(dst->data, dst->size);
183
if (dst_count_p)
184
*dst_count_p = dst_count;
185
}
diffcore-rename.c
+1
-2
@@ -189,8 +189,7 @@ static int estimate_similarity(struct diff_filespec *src,
189
190
delta_limit = (unsigned long)
191
(base_size * (MAX_SCORE-minimum_score) / MAX_SCORE);
192
- if (diffcore_count_changes(src->data, src->size,
193
- dst->data, dst->size,
192
+ if (diffcore_count_changes(src, dst,
193
&src->cnt_data, &dst->cnt_data,
194
delta_limit,
195
&src_copied, &literal_added))
diffcore.h
+2
-2
@@ -103,8 +103,8 @@ void diff_debug_queue(const char *, struct diff_queue_struct *);
103
#define diff_debug_queue(a,b) do {} while(0)
104
#endif
105
106
-extern int diffcore_count_changes(void *src, unsigned long src_size,
107
- void *dst, unsigned long dst_size,
106
+extern int diffcore_count_changes(struct diff_filespec *src,
107
+ struct diff_filespec *dst,
108
void **src_count_p,
109
void **dst_count_p,
110
unsigned long delta_limit,