mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-28 04:49:43 +01:00
Code Activity

Merge branch 'jk/mark-unused-parameters'

Browse source 
Mark unused parameters as UNUSED to squelch -Wunused warnings.

* jk/mark-unused-parameters:
  t-hashmap: stop calling setup() for t_intern() test
  scalar: mark unused parameters in dummy function
  daemon: mark unused parameters in non-posix fallbacks
  setup: mark unused parameter in config callback
  test-mergesort: mark unused parameters in trivial callback
  t-hashmap: mark unused parameters in callback function
  reftable: mark unused parameters in virtual functions
  reftable: drop obsolete test function declarations
  reftable: ignore unused argc/argv in test functions
  unit-tests: ignore unused argc/argv
  t/helper: mark more unused argv/argc arguments
  oss-fuzz: mark unused argv/argc argument
  refs: mark unused parameters in do_for_each_reflog_helper()
  refs: mark unused parameters in ref_store fsck callbacks
  update-ref: mark more unused parameters in parser callbacks
  imap-send: mark unused parameter in ssl_socket_connect() fallback
This commit is contained in:
Junio C Hamano 2024-08-26 11:32:22 -07:00
commit 2b30d66c43
36 changed files with 81 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
builtin/update-ref.c
View file

@ -274,7 +274,7 @@ static void parse_cmd_update(struct ref_transaction *transaction,
}
static void parse_cmd_symref_update(struct ref_transaction *transaction,
const char *next, const char *end)
const char *next, const char *end UNUSED)
{
char *refname, *new_target, *old_arg;
char *old_target = NULL;
@ -360,7 +360,7 @@ static void parse_cmd_create(struct ref_transaction *transaction,
static void parse_cmd_symref_create(struct ref_transaction *transaction,
const char *next, const char *end)
const char *next, const char *end UNUSED)
{
struct strbuf err = STRBUF_INIT;
char *refname, *new_target;
@ -423,7 +423,7 @@ static void parse_cmd_delete(struct ref_transaction *transaction,
static void parse_cmd_symref_delete(struct ref_transaction *transaction,
const char *next, const char *end)
const char *next, const char *end UNUSED)
{
struct strbuf err = STRBUF_INIT;
char *refname, *old_target;
@ -479,7 +479,7 @@ static void parse_cmd_verify(struct ref_transaction *transaction,
}
static void parse_cmd_symref_verify(struct ref_transaction *transaction,
const char *next, const char *end)
const char *next, const char *end UNUSED)
{
struct strbuf err = STRBUF_INIT;
struct object_id old_oid;

6
daemon.c
View file

@ -1177,13 +1177,13 @@ static int service_loop(struct socketlist *socklist)
struct credentials;
static void drop_privileges(struct credentials *cred)
static void drop_privileges(struct credentials *cred UNUSED)
{
/* nothing */
}
static struct credentials *prepare_credentials(const char *user_name,
const char *group_name)
static struct credentials *prepare_credentials(const char *user_name UNUSED,
const char *group_name UNUSED)
{
die("--user not supported on this platform");
}

2
imap-send.c
View file

@ -192,7 +192,7 @@ static void socket_perror(const char *func, struct imap_socket *sock, int ret)
#ifdef NO_OPENSSL
static int ssl_socket_connect(struct imap_socket *sock UNUSED,
const struct imap_server_conf *cfg,
const struct imap_server_conf *cfg UNUSED,
int use_tls_only UNUSED)
{
fprintf(stderr, "SSL requested but SSL support not compiled in\n");

2
oss-fuzz/dummy-cmd-main.c
View file

@ -8,7 +8,7 @@
* executed.
*/
int cmd_main(int argc, const char **argv) {
int cmd_main(int argc UNUSED, const char **argv UNUSED) {
BUG("We should not execute cmd_main() from a fuzz target");
return 1;
}

5
refs.c
View file

@ -2392,9 +2392,10 @@ struct do_for_each_reflog_help {
void *cb_data;
};
static int do_for_each_reflog_helper(const char *refname, const char *referent,
static int do_for_each_reflog_helper(const char *refname,
const char *referent UNUSED,
const struct object_id *oid UNUSED,
int flags,
int flags UNUSED,
void *cb_data)
{
struct do_for_each_reflog_help *hp = cb_data;

4
refs/packed-backend.c
View file

@ -1735,8 +1735,8 @@ static struct ref_iterator *packed_reflog_iterator_begin(struct ref_store *ref_s
return empty_ref_iterator_begin();
}
static int packed_fsck(struct ref_store *ref_store,
struct fsck_options *o)
static int packed_fsck(struct ref_store *ref_store UNUSED,
struct fsck_options *o UNUSED)
{
return 0;
}

18
refs/reftable-backend.c
View file

@ -616,7 +616,7 @@ static struct reftable_ref_iterator *ref_iterator_for_stack(struct reftable_ref_
static struct ref_iterator *reftable_be_iterator_begin(struct ref_store *ref_store,
const char *prefix,
const char **exclude_patterns,
const char **exclude_patterns UNUSED,
unsigned int flags)
{
struct reftable_ref_iterator *main_iter, *worktree_iter;
@ -1125,9 +1125,9 @@ static int reftable_be_transaction_prepare(struct ref_store *ref_store,
return ret;
}
static int reftable_be_transaction_abort(struct ref_store *ref_store,
static int reftable_be_transaction_abort(struct ref_store *ref_store UNUSED,
struct ref_transaction *transaction,
struct strbuf *err)
struct strbuf *err UNUSED)
{
struct reftable_transaction_data *tx_data = transaction->backend_data;
free_transaction_data(tx_data);
@ -1317,7 +1317,7 @@ static int write_transaction_table(struct reftable_writer *writer, void *cb_data
return ret;
}
static int reftable_be_transaction_finish(struct ref_store *ref_store,
static int reftable_be_transaction_finish(struct ref_store *ref_store UNUSED,
struct ref_transaction *transaction,
struct strbuf *err)
{
@ -1728,8 +1728,8 @@ static int reftable_reflog_iterator_advance(struct ref_iterator *ref_iterator)
return ITER_OK;
}
static int reftable_reflog_iterator_peel(struct ref_iterator *ref_iterator,
struct object_id *peeled)
static int reftable_reflog_iterator_peel(struct ref_iterator *ref_iterator UNUSED,
struct object_id *peeled UNUSED)
{
BUG("reftable reflog iterator cannot be peeled");
return -1;
@ -1990,7 +1990,7 @@ static int write_reflog_existence_table(struct reftable_writer *writer,
static int reftable_be_create_reflog(struct ref_store *ref_store,
const char *refname,
struct strbuf *errmsg)
struct strbuf *errmsg UNUSED)
{
struct reftable_ref_store *refs =
reftable_be_downcast(ref_store, REF_STORE_WRITE, "create_reflog");
@ -2311,8 +2311,8 @@ static int reftable_be_reflog_expire(struct ref_store *ref_store,
return ret;
}
static int reftable_be_fsck(struct ref_store *ref_store,
struct fsck_options *o)
static int reftable_be_fsck(struct ref_store *ref_store UNUSED,
struct fsck_options *o UNUSED)
{
return 0;
}

2
reftable/block_test.c
View file

@ -116,7 +116,7 @@ static void test_block_read_write(void)
}
}
int block_test_main(int argc, const char *argv[])
int block_test_main(int argc UNUSED, const char *argv[] UNUSED)
{
RUN_TEST(test_block_read_write);
return 0;

8
reftable/blocksource.c
View file

@ -13,14 +13,14 @@ license that can be found in the LICENSE file or at
#include "reftable-blocksource.h"
#include "reftable-error.h"
static void strbuf_return_block(void *b, struct reftable_block *dest)
static void strbuf_return_block(void *b UNUSED, struct reftable_block *dest)
{
if (dest->len)
memset(dest->data, 0xff, dest->len);
reftable_free(dest->data);
}
static void strbuf_close(void *b)
static void strbuf_close(void *b UNUSED)
{
}
@ -55,7 +55,7 @@ void block_source_from_strbuf(struct reftable_block_source *bs,
bs->arg = buf;
}
static void malloc_return_block(void *b, struct reftable_block *dest)
static void malloc_return_block(void *b UNUSED, struct reftable_block *dest)
{
if (dest->len)
memset(dest->data, 0xff, dest->len);
@ -85,7 +85,7 @@ static uint64_t file_size(void *b)
return ((struct file_block_source *)b)->size;
}
static void file_return_block(void *b, struct reftable_block *dest)
static void file_return_block(void *b UNUSED, struct reftable_block *dest UNUSED)
{
}

8
reftable/generic.c
View file

@ -201,17 +201,19 @@ int iterator_next(struct reftable_iterator *it, struct reftable_record *rec)
return it->ops->next(it->iter_arg, rec);
}
static int empty_iterator_seek(void *arg, struct reftable_record *want)
static int empty_iterator_seek(void *arg UNUSED,
struct reftable_record *want UNUSED)
{
return 0;
}
static int empty_iterator_next(void *arg, struct reftable_record *rec)
static int empty_iterator_next(void *arg UNUSED,
struct reftable_record *rec UNUSED)
{
return 1;
}
static void empty_iterator_close(void *arg)
static void empty_iterator_close(void *arg UNUSED)
{
}

3
reftable/iter.c
View file

@ -127,7 +127,8 @@ static int indexed_table_ref_iter_next_block(struct indexed_table_ref_iter *it)
return 0;
}
static int indexed_table_ref_iter_seek(void *p, struct reftable_record *want)
static int indexed_table_ref_iter_seek(void *p UNUSED,
struct reftable_record *want UNUSED)
{
BUG("seeking indexed table is not supported");
return -1;

31
reftable/record.c
View file

@ -516,7 +516,7 @@ static void reftable_obj_record_release(void *rec)
memset(obj, 0, sizeof(struct reftable_obj_record));
}
static void reftable_obj_record_print(const void *rec, int hash_size)
static void reftable_obj_record_print(const void *rec, int hash_size UNUSED)
{
const struct reftable_obj_record *obj = rec;
char hex[GIT_MAX_HEXSZ + 1] = { 0 };
@ -532,7 +532,7 @@ static void reftable_obj_record_print(const void *rec, int hash_size)
}
static void reftable_obj_record_copy_from(void *rec, const void *src_rec,
int hash_size)
int hash_size UNUSED)
{
struct reftable_obj_record *obj = rec;
const struct reftable_obj_record *src =
@ -559,7 +559,7 @@ static uint8_t reftable_obj_record_val_type(const void *rec)
}
static int reftable_obj_record_encode(const void *rec, struct string_view s,
int hash_size)
int hash_size UNUSED)
{
const struct reftable_obj_record *r = rec;
struct string_view start = s;
@ -594,7 +594,8 @@ static int reftable_obj_record_encode(const void *rec, struct string_view s,
static int reftable_obj_record_decode(void *rec, struct strbuf key,
uint8_t val_type, struct string_view in,
int hash_size, struct strbuf *scratch UNUSED)
int hash_size UNUSED,
struct strbuf *scratch UNUSED)
{
struct string_view start = in;
struct reftable_obj_record *r = rec;
@ -647,12 +648,13 @@ static int reftable_obj_record_decode(void *rec, struct strbuf key,
return start.len - in.len;
}
static int not_a_deletion(const void *p)
static int not_a_deletion(const void *p UNUSED)
{
return 0;
}
static int reftable_obj_record_equal_void(const void *a, const void *b, int hash_size)
static int reftable_obj_record_equal_void(const void *a, const void *b,
int hash_size UNUSED)
{
struct reftable_obj_record *ra = (struct reftable_obj_record *) a;
struct reftable_obj_record *rb = (struct reftable_obj_record *) b;
@ -1066,7 +1068,7 @@ static void reftable_index_record_key(const void *r, struct strbuf *dest)
}
static void reftable_index_record_copy_from(void *rec, const void *src_rec,
int hash_size)
int hash_size UNUSED)
{
struct reftable_index_record *dst = rec;
const struct reftable_index_record *src = src_rec;
@ -1082,13 +1084,13 @@ static void reftable_index_record_release(void *rec)
strbuf_release(&idx->last_key);
}
static uint8_t reftable_index_record_val_type(const void *rec)
static uint8_t reftable_index_record_val_type(const void *rec UNUSED)
{
return 0;
}
static int reftable_index_record_encode(const void *rec, struct string_view out,
int hash_size)
int hash_size UNUSED)
{
const struct reftable_index_record *r =
(const struct reftable_index_record *)rec;
@ -1104,8 +1106,10 @@ static int reftable_index_record_encode(const void *rec, struct string_view out,
}
static int reftable_index_record_decode(void *rec, struct strbuf key,
uint8_t val_type, struct string_view in,
int hash_size, struct strbuf *scratch UNUSED)
uint8_t val_type UNUSED,
struct string_view in,
int hash_size UNUSED,
struct strbuf *scratch UNUSED)
{
struct string_view start = in;
struct reftable_index_record *r = rec;
@ -1122,7 +1126,8 @@ static int reftable_index_record_decode(void *rec, struct strbuf key,
return start.len - in.len;
}
static int reftable_index_record_equal(const void *a, const void *b, int hash_size)
static int reftable_index_record_equal(const void *a, const void *b,
int hash_size UNUSED)
{
struct reftable_index_record *ia = (struct reftable_index_record *) a;
struct reftable_index_record *ib = (struct reftable_index_record *) b;
@ -1137,7 +1142,7 @@ static int reftable_index_record_cmp(const void *_a, const void *_b)
return strbuf_cmp(&a->last_key, &b->last_key);
}
static void reftable_index_record_print(const void *rec, int hash_size)
static void reftable_index_record_print(const void *rec, int hash_size UNUSED)
{
const struct reftable_index_record *idx = rec;
/* TODO: escape null chars? */

2
reftable/reftable-tests.h
View file

@ -9,9 +9,7 @@ license that can be found in the LICENSE file or at
#ifndef REFTABLE_TESTS_H
#define REFTABLE_TESTS_H
int basics_test_main(int argc, const char **argv);
int block_test_main(int argc, const char **argv);
int record_test_main(int argc, const char **argv);
int stack_test_main(int argc, const char **argv);
int reftable_dump_main(int argc, char *const *argv);

6
reftable/stack_test.c
View file

@ -399,7 +399,7 @@ static void test_reftable_stack_auto_compaction_fails_gracefully(void)
clear_dir(dir);
}
static int write_error(struct reftable_writer *wr, void *arg)
static int write_error(struct reftable_writer *wr UNUSED, void *arg)
{
return *((int *)arg);
}
@ -816,7 +816,7 @@ static void test_reflog_expire(void)
reftable_log_record_release(&log);
}
static int write_nothing(struct reftable_writer *wr, void *arg)
static int write_nothing(struct reftable_writer *wr, void *arg UNUSED)
{
reftable_writer_set_limits(wr, 1, 1);
return 0;
@ -1084,7 +1084,7 @@ static void test_reftable_stack_compaction_concurrent_clean(void)
clear_dir(dir);
}
int stack_test_main(int argc, const char *argv[])
int stack_test_main(int argc UNUSED, const char *argv[] UNUSED)
{
RUN_TEST(test_empty_add);
RUN_TEST(test_read_file);

2
reftable/test_framework.c
View file

@ -21,7 +21,7 @@ ssize_t strbuf_add_void(void *b, const void *data, size_t sz)
return sz;
}
int noop_flush(void *arg)
int noop_flush(void *arg UNUSED)
{
return 0;
}

2
reftable/writer.c
View file

@ -544,7 +544,7 @@ static void write_object_record(void *void_arg, void *key)
done:;
}
static void object_record_free(void *void_arg, void *key)
static void object_record_free(void *void_arg UNUSED, void *key)
{
struct obj_index_tree_node *entry = key;

3
scalar.c
View file

@ -400,7 +400,8 @@ static int delete_enlistment(struct strbuf *enlistment)
* Dummy implementation; Using `get_version_info()` would cause a link error
* without this.
*/
void load_builtin_commands(const char *prefix, struct cmdnames *cmds)
void load_builtin_commands(const char *prefix UNUSED,
struct cmdnames *cmds UNUSED)
{
die("not implemented");
}

2
setup.c
View file

@ -1907,7 +1907,7 @@ struct template_dir_cb_data {
};
static int template_dir_cb(const char *key, const char *value,
const struct config_context *ctx, void *d)
const struct config_context *ctx UNUSED, void *d)
{
struct template_dir_cb_data *data = d;

2
t/helper/test-example-tap.c
View file

@ -70,7 +70,7 @@ static void t_empty(void)
; /* empty */
}
int cmd__example_tap(int argc, const char **argv)
int cmd__example_tap(int argc UNUSED, const char **argv UNUSED)
{
check(1);

2
t/helper/test-hashmap.c
View file

@ -138,7 +138,7 @@ static void perf_hashmap(unsigned int method, unsigned int rounds)
*
* perfhashmap method rounds -> test hashmap.[ch] performance
*/
int cmd__hashmap(int argc, const char **argv)
int cmd__hashmap(int argc UNUSED, const char **argv UNUSED)
{
struct string_list parts = STRING_LIST_INIT_NODUP;
struct strbuf line = STRBUF_INIT;

2
t/helper/test-mergesort.c
View file

@ -122,7 +122,7 @@ static const struct dist *get_dist_by_name(const char *name)
return NULL;
}
static void mode_copy(int *arr, int n)
static void mode_copy(int *arr UNUSED, int n UNUSED)
{
/* nothing */
}

2
t/unit-tests/t-ctype.c
View file

@ -31,7 +31,7 @@
"\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f" \
"\x7f"
int cmd_main(int argc, const char **argv) {
int cmd_main(int argc UNUSED, const char **argv UNUSED) {
TEST_CHAR_CLASS(isspace, " \n\r\t");
TEST_CHAR_CLASS(isdigit, DIGIT);
TEST_CHAR_CLASS(isalpha, LOWER UPPER);

2
t/unit-tests/t-hash.c
View file

@ -38,7 +38,7 @@ static void check_hash_data(const void *data, size_t data_length,
"SHA1 and SHA256 (%s) works", #literal); \
} while (0)
int cmd_main(int argc, const char **argv)
int cmd_main(int argc UNUSED, const char **argv UNUSED)
{
struct strbuf aaaaaaaaaa_100000 = STRBUF_INIT;
struct strbuf alphabet_100000 = STRBUF_INIT;

4
t/unit-tests/t-hashmap.c
View file

@ -322,7 +322,7 @@ static void t_alloc(struct hashmap *map, unsigned int ignore_case)
free(removed);
}
static void t_intern(struct hashmap *map, unsigned int ignore_case)
static void t_intern(void)
{
const char *values[] = { "value1", "Value1", "value2", "value2" };
@ -356,6 +356,6 @@ int cmd_main(int argc UNUSED, const char **argv UNUSED)
TEST(setup(t_iterate, 0), "iterate works");
TEST(setup(t_iterate, 1), "iterate (case insensitive) works");
TEST(setup(t_alloc, 0), "grow / shrink works");
TEST(setup(t_intern, 0), "string interning works");
TEST(t_intern(), "string interning works");
return test_done();
}

2
t/unit-tests/t-mem-pool.c
View file

@ -20,7 +20,7 @@ static void t_calloc_100(struct mem_pool *pool)
check(pool->mp_block->end != NULL);
}
int cmd_main(int argc, const char **argv)
int cmd_main(int argc UNUSED, const char **argv UNUSED)
{
TEST(setup_static(t_calloc_100, 1024 * 1024),
"mem_pool_calloc returns 100 zeroed bytes with big block");

2
t/unit-tests/t-prio-queue.c
View file

@ -69,7 +69,7 @@ static void test_prio_queue(int *input, size_t input_size,
#define TEST_INPUT(input, result) \
test_prio_queue(input, ARRAY_SIZE(input), result, ARRAY_SIZE(result))
int cmd_main(int argc, const char **argv)
int cmd_main(int argc UNUSED, const char **argv UNUSED)
{
TEST(TEST_INPUT(((int []){ 2, 6, 3, 10, 9, 5, 7, 4, 5, 8, 1, DUMP }),
((int []){ 1, 2, 3, 4, 5, 5, 6, 7, 8, 9, 10 })),

2
t/unit-tests/t-reftable-basics.c
View file

@ -20,7 +20,7 @@ static int integer_needle_lesseq(size_t i, void *_args)
return args->needle <= args->haystack[i];
}
int cmd_main(int argc, const char *argv[])
int cmd_main(int argc UNUSED, const char *argv[] UNUSED)
{
if_test ("binary search with binsearch works") {
int haystack[] = { 2, 4, 6, 8, 10 };

4
t/unit-tests/t-reftable-merged.c
View file

@ -22,7 +22,7 @@ static ssize_t strbuf_add_void(void *b, const void *data, const size_t sz)
return sz;
}
static int noop_flush(void *arg)
static int noop_flush(void *arg UNUSED)
{
return 0;
}
@ -452,7 +452,7 @@ static void t_default_write_opts(void)
}
int cmd_main(int argc, const char *argv[])
int cmd_main(int argc UNUSED, const char *argv[] UNUSED)
{
TEST(t_default_write_opts(), "merged table with default write opts");
TEST(t_merged_logs(), "merged table with multiple log updates for same ref");

2
t/unit-tests/t-reftable-pq.c
View file

@ -142,7 +142,7 @@ static void t_merged_iter_pqueue_top(void)
merged_iter_pqueue_release(&pq);
}
int cmd_main(int argc, const char *argv[])
int cmd_main(int argc UNUSED, const char *argv[] UNUSED)
{
TEST(t_pq_record(), "pq works with record-based comparison");
TEST(t_pq_index(), "pq works with index-based comparison");

2
t/unit-tests/t-reftable-readwrite.c
View file

@ -945,7 +945,7 @@ static void t_corrupt_table(void)
strbuf_release(&buf);
}
int cmd_main(int argc, const char *argv[])
int cmd_main(int argc UNUSED, const char *argv[] UNUSED)
{
TEST(t_buffer(), "strbuf works as blocksource");
TEST(t_corrupt_table(), "read-write on corrupted table");

2
t/unit-tests/t-reftable-record.c
View file

@ -532,7 +532,7 @@ static void t_reftable_index_record_roundtrip(void)
strbuf_release(&in.u.idx.last_key);
}
int cmd_main(int argc, const char *argv[])
int cmd_main(int argc UNUSED, const char *argv[] UNUSED)
{
TEST(t_reftable_ref_record_comparison(), "comparison operations work on ref record");
TEST(t_reftable_log_record_comparison(), "comparison operations work on log record");

2
t/unit-tests/t-reftable-tree.c
View file

@ -75,7 +75,7 @@ static void t_infix_walk(void)
tree_free(root);
}
int cmd_main(int argc, const char *argv[])
int cmd_main(int argc UNUSED, const char *argv[] UNUSED)
{
TEST(t_tree_search(), "tree_search works");
TEST(t_infix_walk(), "infix_walk works");

2
t/unit-tests/t-strbuf.c
View file

@ -105,7 +105,7 @@ static void t_addstr(struct strbuf *buf, const void *data)
check_str(buf->buf + orig_len, text);
}
int cmd_main(int argc, const char **argv)
int cmd_main(int argc UNUSED, const char **argv UNUSED)
{
if (!TEST(t_static_init(), "static initialization works"))
test_skip_all("STRBUF_INIT is broken");

2
t/unit-tests/t-strcmp-offset.c
View file

@ -24,7 +24,7 @@ static void check_strcmp_offset(const char *string1, const char *string2,
expect_offset), \
"strcmp_offset(%s, %s) works", #string1, #string2)
int cmd_main(int argc, const char **argv)
int cmd_main(int argc UNUSED, const char **argv UNUSED)
{
TEST_STRCMP_OFFSET("abc", "abc", 0, 3);
TEST_STRCMP_OFFSET("abc", "def", -1, 0);

2
t/unit-tests/t-strvec.c
View file

@ -19,7 +19,7 @@
} \
} while (0)
int cmd_main(int argc, const char **argv)
int cmd_main(int argc UNUSED, const char **argv UNUSED)
{
if_test ("static initialization") {
struct strvec vec = STRVEC_INIT;

2
t/unit-tests/t-trailer.c
View file

@ -308,7 +308,7 @@ static void run_t_trailer_iterator(void)
}
}
int cmd_main(int argc, const char **argv)
int cmd_main(int argc UNUSED, const char **argv UNUSED)
{
run_t_trailer_iterator();
return test_done();