patch-id: call flush_current_id() only when needed

The caller passes a flag that is used to become no-op when calling
flush_current_id().  Instead of calling something that becomes a
no-op, teach the caller not to call it in the first place.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/patch-id.c b/builtin/patch-id.c
index 3894d2b970612cab4a47250dd53da5b0908c820e..0f262e7a03cb98b7bee710d5d04d9ee32743bd57 100644 (file)
--- a/builtin/patch-id.c
+++ b/builtin/patch-id.c
@@ -6,10 +6,9 @@
 #include "hex.h"
 #include "parse-options.h"
 
-static void flush_current_id(int patchlen, struct object_id *id, struct object_id *result)
+static void flush_current_id(struct object_id *id, struct object_id *result)
 {
-       if (patchlen)
-               printf("%s %s\n", oid_to_hex(result), oid_to_hex(id));
+       printf("%s %s\n", oid_to_hex(result), oid_to_hex(id));
 }
 
 static int remove_space(char *line)
@@ -181,7 +180,8 @@ static void generate_id_list(int stable, int verbatim)
        oidclr(&oid);
        while (!feof(stdin)) {
                patchlen = get_one_patchid(&n, &result, &line_buf, stable, verbatim);
-               flush_current_id(patchlen, &oid, &result);
+               if (patchlen)
+                       flush_current_id(&oid, &result);
                oidcpy(&oid, &n);
        }
        strbuf_release(&line_buf);