diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-04-06 13:38:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-04-06 13:38:28 -0700 |
| commit | 955abf5f72617f6044fdadeeaee7e9b78735340a (patch) | |
| tree | d3a9fcf9cb14ef496f65a4f16938699b87f14414 /builtin/diff.c | |
| parent | Merge branch 'jk/unused-post-2.40' (diff) | |
| parent | parse-options: drop parse_opt_unknown_cb() (diff) | |
| download | git-955abf5f72617f6044fdadeeaee7e9b78735340a.tar.gz git-955abf5f72617f6044fdadeeaee7e9b78735340a.zip | |
Merge branch 'jk/unused-post-2.40-part2'
Code clean-up for "-Wunused-parameter" build.
* jk/unused-post-2.40-part2:
parse-options: drop parse_opt_unknown_cb()
t/helper: mark unused argv/argc arguments
mark "argv" as unused when we check argc
builtins: mark unused prefix parameters
builtins: annotate always-empty prefix parameters
builtins: always pass prefix to parse_options()
fast-import: fix file access when run from subdir
Diffstat (limited to 'builtin/diff.c')
| -rw-r--r-- | builtin/diff.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/diff.c b/builtin/diff.c index 26f1e532c6..bc9da7bcb6 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -74,7 +74,7 @@ static void stuff_change(struct diff_options *opt, } static int builtin_diff_b_f(struct rev_info *revs, - int argc, const char **argv, + int argc, const char **argv UNUSED, struct object_array_entry **blob) { /* Blob vs file in the working tree*/ @@ -109,7 +109,7 @@ static int builtin_diff_b_f(struct rev_info *revs, } static int builtin_diff_blobs(struct rev_info *revs, - int argc, const char **argv, + int argc, const char **argv UNUSED, struct object_array_entry **blob) { const unsigned mode = canon_mode(S_IFREG | 0644); @@ -209,7 +209,7 @@ static int builtin_diff_tree(struct rev_info *revs, } static int builtin_diff_combined(struct rev_info *revs, - int argc, const char **argv, + int argc, const char **argv UNUSED, struct object_array_entry *ent, int ents, int first_non_parent) { |