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>

diff --git a/combine-diff.c b/combine-diff.c
index f2f38064773876123b5883d4a3d974d38d57d381..4c6bfed56ee0fe3c84124e0b9a9c5bb80c9abcf2 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -7,13 +7,6 @@
 #include "xdiff-interface.h"
 #include "log-tree.h"
 
 #include "xdiff-interface.h"
 #include "log-tree.h"
 

-static int uninteresting(struct diff_filepair *p)
-{
-       if (diff_unmodified_pair(p))
-               return 1;
-       return 0;
-}
-

 static struct combine_diff_path *intersect_paths(struct combine_diff_path *curr, int n, int num_parent)
 {
        struct diff_queue_struct *q = &diff_queued_diff;
 static struct combine_diff_path *intersect_paths(struct combine_diff_path *curr, int n, int num_parent)
 {
        struct diff_queue_struct *q = &diff_queued_diff;


@@ -25,7 +18,7 @@ static struct combine_diff_path *intersect_paths(struct combine_diff_path *curr,
                for (i = 0; i < q->nr; i++) {
                        int len;
                        const char *path;
                for (i = 0; i < q->nr; i++) {
                        int len;
                        const char *path;

-                       if (uninteresting(q->queue[i]))
+                       if (diff_unmodified_pair(q->queue[i]))

                                continue;
                        path = q->queue[i]->two->path;
                        len = strlen(path);
                                continue;
                        path = q->queue[i]->two->path;
                        len = strlen(path);


@@ -57,7 +50,7 @@ static struct combine_diff_path *intersect_paths(struct combine_diff_path *curr,
                        const char *path;
                        int len;
 
                        const char *path;
                        int len;
 

-                       if (uninteresting(q->queue[i]))
+                       if (diff_unmodified_pair(q->queue[i]))

                                continue;
                        path = q->queue[i]->two->path;
                        len = strlen(path);
                                continue;
                        path = q->queue[i]->two->path;
                        len = strlen(path);