t/helper: mark unused argv/argc arguments

Many test helper programs do not bother to look at argc or argv, because
they don't take any options. In a user-facing program, it's a good idea
to check for unexpected arguments and complain. But for a test helper,
it's not worth the trouble to enforce this.

But we do want to tell the compiler we're OK with ignoring them, to
silence -Wunused-parameter (and obviously we can't get rid of them,
since we have to conform to the usual cmd__foo() interface).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2023-03-28 16:57:25 -04:00 committed by Junio C Hamano
parent 6ba21fa65c
commit 126e3b3d2a
27 changed files with 33 additions and 32 deletions

View File

@ -47,7 +47,7 @@ static int is_in(const char *s, int ch)
"\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f" \
"\x7f"
int cmd__ctype(int argc, const char **argv)
int cmd__ctype(int argc UNUSED, const char **argv UNUSED)
{
TEST_CLASS(isdigit, DIGIT);
TEST_CLASS(isspace, " \n\r\t");

View File

@ -104,7 +104,7 @@ static void getnanos(const char **argv)
printf("%lf\n", seconds);
}
int cmd__date(int argc, const char **argv)
int cmd__date(int argc UNUSED, const char **argv)
{
const char *x;

View File

@ -155,7 +155,7 @@ static int cmd_dropcaches(void)
#endif
int cmd__drop_caches(int argc, const char **argv)
int cmd__drop_caches(int argc UNUSED, const char **argv UNUSED)
{
cmd_sync();
return cmd_dropcaches();

View File

@ -57,7 +57,7 @@ static int dump_cache_tree(struct cache_tree *it,
return errs;
}
int cmd__dump_cache_tree(int ac, const char **av)
int cmd__dump_cache_tree(int ac UNUSED, const char **av UNUSED)
{
struct index_state istate;
struct cache_tree *another = cache_tree();

View File

@ -1,7 +1,7 @@
#include "test-tool.h"
#include "cache.h"
int cmd__dump_fsmonitor(int ac, const char **av)
int cmd__dump_fsmonitor(int ac UNUSED, const char **av UNUSED)
{
struct index_state *istate = the_repository->index;
int i;

View File

@ -10,7 +10,7 @@ static void show_bit(size_t pos, void *data)
printf(" %d", (int)pos);
}
int cmd__dump_split_index(int ac, const char **av)
int cmd__dump_split_index(int ac UNUSED, const char **av)
{
struct split_index *si;
int i;

View File

@ -41,7 +41,7 @@ static void dump(struct untracked_cache_dir *ucd, struct strbuf *base)
strbuf_setlen(base, len);
}
int cmd__dump_untracked_cache(int ac, const char **av)
int cmd__dump_untracked_cache(int ac UNUSED, const char **av UNUSED)
{
struct untracked_cache *uc;
struct strbuf base = STRBUF_INIT;

View File

@ -3,7 +3,7 @@
#include "object.h"
#include "decorate.h"
int cmd__example_decorate(int argc, const char **argv)
int cmd__example_decorate(int argc UNUSED, const char **argv UNUSED)
{
struct decoration n;
struct object_id one_oid = { {1} };

View File

@ -11,7 +11,7 @@
#include "trace2.h"
#ifndef HAVE_FSMONITOR_DAEMON_BACKEND
int cmd__fsmonitor_client(int argc, const char **argv)
int cmd__fsmonitor_client(int argc UNUSED, const char **argv UNUSED)
{
die("fsmonitor--daemon not available on this platform");
}

View File

@ -4,7 +4,7 @@
/*
* Read stdin and print a hexdump to stdout.
*/
int cmd__hexdump(int argc, const char **argv)
int cmd__hexdump(int argc UNUSED, const char **argv UNUSED)
{
char buf[1024];
ssize_t i, len;

View File

@ -1,7 +1,7 @@
#include "test-tool.h"
#include "cache.h"
int cmd__index_version(int argc, const char **argv)
int cmd__index_version(int argc UNUSED, const char **argv UNUSED)
{
struct cache_header hdr;
int version;

View File

@ -3,7 +3,7 @@
#include "hex.h"
#include "tree.h"
int cmd__match_trees(int ac, const char **av)
int cmd__match_trees(int ac UNUSED, const char **av)
{
struct object_id hash1, hash2, shifted;
struct tree *one, *two;

View File

@ -9,7 +9,7 @@ static int print_oid(const struct object_id *oid, void *data)
return 0;
}
int cmd__oid_array(int argc, const char **argv)
int cmd__oid_array(int argc UNUSED, const char **argv UNUSED)
{
struct oid_array array = OID_ARRAY_INIT;
struct strbuf line = STRBUF_INIT;

View File

@ -22,7 +22,7 @@ struct test_entry {
* iterate -> oidkey1 namevalue1\noidkey2 namevalue2\n...
*
*/
int cmd__oidmap(int argc, const char **argv)
int cmd__oidmap(int argc UNUSED, const char **argv UNUSED)
{
struct strbuf line = STRBUF_INIT;
struct oidmap map = OIDMAP_INIT;

View File

@ -3,13 +3,13 @@
#include "hex.h"
#include "oidtree.h"
static enum cb_next print_oid(const struct object_id *oid, void *data)
static enum cb_next print_oid(const struct object_id *oid, void *data UNUSED)
{
puts(oid_to_hex(oid));
return CB_CONTINUE;
}
int cmd__oidtree(int argc, const char **argv)
int cmd__oidtree(int argc UNUSED, const char **argv UNUSED)
{
struct oidtree ot;
struct strbuf line = STRBUF_INIT;

View File

@ -2,7 +2,7 @@
#include "git-compat-util.h"
#include "thread-utils.h"
int cmd__online_cpus(int argc, const char **argv)
int cmd__online_cpus(int argc UNUSED, const char **argv UNUSED)
{
printf("%d\n", online_cpus());
return 0;

View File

@ -263,14 +263,14 @@ int cmd__parse_options_flags(int argc, const char **argv)
return parse_options_flags__cmd(argc, argv, test_flags);
}
static int subcmd_one(int argc, const char **argv, const char *prefix)
static int subcmd_one(int argc, const char **argv, const char *prefix UNUSED)
{
printf("fn: subcmd_one\n");
print_args(argc, argv);
return 0;
}
static int subcmd_two(int argc, const char **argv, const char *prefix)
static int subcmd_two(int argc, const char **argv, const char *prefix UNUSED)
{
printf("fn: subcmd_two\n");
print_args(argc, argv);

View File

@ -16,7 +16,7 @@ static void show(int *v)
free(v);
}
int cmd__prio_queue(int argc, const char **argv)
int cmd__prio_queue(int argc UNUSED, const char **argv)
{
struct prio_queue pq = { intcmp };

View File

@ -5,7 +5,7 @@
#include "object-store.h"
#include "bloom.h"
int cmd__read_graph(int argc, const char **argv)
int cmd__read_graph(int argc UNUSED, const char **argv UNUSED)
{
struct commit_graph *graph = NULL;
struct object_directory *odb;

View File

@ -201,7 +201,8 @@ static int cmd_verify_ref(struct ref_store *refs, const char **argv)
return ret;
}
static int cmd_for_each_reflog(struct ref_store *refs, const char **argv)
static int cmd_for_each_reflog(struct ref_store *refs,
const char **argv UNUSED)
{
return refs_for_each_reflog(refs, each_ref, NULL);
}
@ -323,7 +324,7 @@ static struct command commands[] = {
{ NULL, NULL }
};
int cmd__ref_store(int argc, const char **argv)
int cmd__ref_store(int argc UNUSED, const char **argv)
{
struct ref_store *refs;
const char *func;

View File

@ -5,7 +5,7 @@
#include "tree.h"
#include "cache-tree.h"
int cmd__scrap_cache_tree(int ac, const char **av)
int cmd__scrap_cache_tree(int ac UNUSED, const char **av UNUSED)
{
struct lock_file index_lock = LOCK_INIT;

View File

@ -13,7 +13,7 @@ X(two)
X(three)
#undef X
int cmd__sigchain(int argc, const char **argv)
int cmd__sigchain(int argc UNUSED, const char **argv UNUSED)
{
sigchain_push(SIGTERM, one);
sigchain_push(SIGTERM, two);

View File

@ -1,7 +1,7 @@
#include "test-tool.h"
#include "cache.h"
int cmd__strcmp_offset(int argc, const char **argv)
int cmd__strcmp_offset(int argc UNUSED, const char **argv)
{
int result;
size_t offset;

View File

@ -4,7 +4,7 @@
#include "submodule-config.h"
#include "submodule.h"
static void die_usage(int argc, const char **argv, const char *msg)
static void die_usage(int argc UNUSED, const char **argv, const char *msg)
{
fprintf(stderr, "%s\n", msg);
fprintf(stderr, "Usage: %s [<commit> <submodulepath>] ...\n", argv[0]);

View File

@ -174,7 +174,7 @@ static int cmd__submodule_config_unset(int argc, const char **argv)
usage_with_options(usage, options);
}
static int cmd__submodule_config_writeable(int argc, const char **argv)
static int cmd__submodule_config_writeable(int argc, const char **argv UNUSED)
{
struct option options[] = {
OPT_END()

View File

@ -208,7 +208,7 @@ static int ut_007BUG(int argc, const char **argv)
BUG("the bug message");
}
static int ut_008bug(int argc, const char **argv)
static int ut_008bug(int argc UNUSED, const char **argv UNUSED)
{
bug("a bug message");
bug("another bug message");
@ -216,7 +216,7 @@ static int ut_008bug(int argc, const char **argv)
return 0;
}
static int ut_009bug_BUG(int argc, const char **argv)
static int ut_009bug_BUG(int argc UNUSED, const char **argv UNUSED)
{
bug("a bug message");
bug("another bug message");
@ -224,7 +224,7 @@ static int ut_009bug_BUG(int argc, const char **argv)
return 0;
}
static int ut_010bug_BUG(int argc, const char **argv)
static int ut_010bug_BUG(int argc UNUSED, const char **argv UNUSED)
{
bug("a %s message", "bug");
BUG("a %s message", "BUG");

View File

@ -6,7 +6,7 @@ static const char *utf8_replace_character = "&#xfffd;";
* Encodes (possibly incorrect) UTF-8 on <stdin> to <stdout>, to be embedded
* in an XML file.
*/
int cmd__xml_encode(int argc, const char **argv)
int cmd__xml_encode(int argc UNUSED, const char **argv UNUSED)
{
unsigned char buf[1024], tmp[4], *tmp2 = NULL;
ssize_t cur = 0, len = 1, remaining = 0;