[PATCH 04/10] diff.c: rename diff_flush_patch to diff_flush_patch_filepair

[Stefan Beller]

From: Stefan Beller <sbel...@google.com>

Signed-off-by: Stefan Beller <sbel...@google.com>
---
 diff.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/diff.c b/diff.c
index 9d2e704..85fb887 100644
--- a/diff.c
+++ b/diff.c
@@ -4176,7 +4176,7 @@ int diff_unmodified_pair(struct diff_filepair *p)
        return 0;
 }
 
-static void diff_flush_patch(struct diff_filepair *p, struct diff_options *o)
+static void diff_flush_patch_filepair(struct diff_filepair *p, struct 
diff_options *o)
 {
        if (diff_unmodified_pair(p))
                return;
@@ -4672,7 +4672,7 @@ void diff_flush(struct diff_options *options)
            DIFF_OPT_TST(options, EXIT_WITH_STATUS) &&
            DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) {
                /*
-                * run diff_flush_patch for the exit status. setting
+                * run diff_flush_patch_filepair for the exit status. setting
                 * options->file to /dev/null should be safe, because we
                 * aren't supposed to produce any output anyway.
                 */
@@ -4685,7 +4685,7 @@ void diff_flush(struct diff_options *options)
                for (i = 0; i < q->nr; i++) {
                        struct diff_filepair *p = q->queue[i];
                        if (check_pair_status(p))
-                               diff_flush_patch(p, options);
+                               diff_flush_patch_filepair(p, options);
                        if (options->found_changes)
                                break;
                }
@@ -4705,7 +4705,7 @@ void diff_flush(struct diff_options *options)
                for (i = 0; i < q->nr; i++) {
                        struct diff_filepair *p = q->queue[i];
                        if (check_pair_status(p))
-                               diff_flush_patch(p, options);
+                               diff_flush_patch_filepair(p, options);
                }
        }
 
-- 
2.7.4