Fix gcc 8.1.1 compiler warnings

[cgit.git] / ui-patch.c

diff --git a/ui-patch.c b/ui-patch.c
index ec7f352340d478bdb11adbde8dc2a9f4462e3f42..8007a1181224b8360c85d1553c5045263d12acba 100644 (file)
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -18,8 +18,8 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
        struct commit *commit;
        struct object_id new_rev_oid, old_rev_oid;
        char rev_range[2 * 40 + 3];
-       const char *rev_argv[] = { NULL, "--reverse", "--format=email", rev_range, "--", prefix };
-       int rev_argc = ARRAY_SIZE(rev_argv);
+       const char *rev_argv[] = { NULL, "--reverse", "--format=email", rev_range, "--", prefix, NULL };
+       int rev_argc = ARRAY_SIZE(rev_argv) - 1;
        char *patchname;
 
        if (!prefix)
@@ -33,7 +33,7 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
                                "Bad object id: %s", new_rev);
                return;
        }
-       commit = lookup_commit_reference(new_rev_oid.hash);
+       commit = lookup_commit_reference(&new_rev_oid);
        if (!commit) {
                cgit_print_error_page(404, "Not found",
                                "Bad commit reference: %s", new_rev);
@@ -46,7 +46,7 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
                                        "Bad object id: %s", old_rev);
                        return;
                }
-               if (!lookup_commit_reference(old_rev_oid.hash)) {
+               if (!lookup_commit_reference(&old_rev_oid)) {
                        cgit_print_error_page(404, "Not found",
                                        "Bad commit reference: %s", old_rev);
                        return;
@@ -85,14 +85,11 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
                        DIFF_FORMAT_PATCH | DIFF_FORMAT_SUMMARY;
        if (prefix)
                rev.diffopt.stat_sep = fmt("(limited to '%s')\n\n", prefix);
-       setup_revisions(ARRAY_SIZE(rev_argv), rev_argv, &rev,
-                       NULL);
+       setup_revisions(rev_argc, rev_argv, &rev, NULL);
        prepare_revision_walk(&rev);
 
        while ((commit = get_revision(&rev)) != NULL) {
                log_tree_commit(&rev, commit);
                printf("-- \ncgit %s\n\n", cgit_version);
        }
-
-       fflush(stdout);
 }