@matheusbsbs / matheus-bagliano / commits / a976b0a593
Fork 0

Remove combine-diff.c::uninteresting()

A patch from David Rientjes made me realize we do not have to have this function -- just call diff_unmodified_pair() directly. Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Aug 14, 2006 at 18:36 UTC a976b0a5933f37e7e8a1829703705268bc829794
1 file changed +2 -9
combine-diff.c
+2 -9
@@ -7,13 +7,6 @@
7 #include "xdiff-interface.h"
8 #include "log-tree.h"
9
10 -static int uninteresting(struct diff_filepair *p)
11 -{
12 - if (diff_unmodified_pair(p))
13 - return 1;
14 - return 0;
15 -}
16 -
10 static struct combine_diff_path *intersect_paths(struct combine_diff_path *curr, int n, int num_parent)
11 {
12 struct diff_queue_struct *q = &diff_queued_diff;
@@ -25,7 +18,7 @@ static struct combine_diff_path *intersect_paths(struct combine_diff_path *curr,
18 for (i = 0; i < q->nr; i++) {
19 int len;
20 const char *path;
28 - if (uninteresting(q->queue[i]))
21 + if (diff_unmodified_pair(q->queue[i]))
22 continue;
23 path = q->queue[i]->two->path;
24 len = strlen(path);
@@ -57,7 +50,7 @@ static struct combine_diff_path *intersect_paths(struct combine_diff_path *curr,
50 const char *path;
51 int len;
52
60 - if (uninteresting(q->queue[i]))
53 + if (diff_unmodified_pair(q->queue[i]))
54 continue;
55 path = q->queue[i]->two->path;
56 len = strlen(path);