mirror of
https://github.com/git/git.git
synced 2024-05-09 18:26:08 +02:00
drop unused argc parameters
Many functions take an argv/argc pair, but never actually look at argc. This makes it useless at best (we use the NULL sentinel in argv to find the end of the array), and misleading at worst (what happens if the argc count does not match the argv NULL?). In each of these instances, the argv NULL does match the argc count, so there are no bugs here. But let's tighten the interfaces to make it harder to get wrong (and to reduce some -Wunused-parameter complaints). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
185e865226
commit
e885a84f1b
|
@ -239,7 +239,7 @@ int run_add_interactive(const char *revision, const char *patch_mode,
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
int interactive_add(int argc, const char **argv, const char *prefix, int patch)
|
int interactive_add(const char **argv, const char *prefix, int patch)
|
||||||
{
|
{
|
||||||
struct pathspec pathspec;
|
struct pathspec pathspec;
|
||||||
|
|
||||||
|
@ -451,7 +451,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
|
||||||
if (add_interactive) {
|
if (add_interactive) {
|
||||||
if (pathspec_from_file)
|
if (pathspec_from_file)
|
||||||
die(_("--pathspec-from-file is incompatible with --interactive/--patch"));
|
die(_("--pathspec-from-file is incompatible with --interactive/--patch"));
|
||||||
exit(interactive_add(argc - 1, argv + 1, prefix, patch_interactive));
|
exit(interactive_add(argv + 1, prefix, patch_interactive));
|
||||||
}
|
}
|
||||||
if (legacy_stash_p) {
|
if (legacy_stash_p) {
|
||||||
struct pathspec pathspec;
|
struct pathspec pathspec;
|
||||||
|
|
|
@ -326,7 +326,7 @@ static void refresh_cache_or_die(int refresh_flags)
|
||||||
die_resolve_conflict("commit");
|
die_resolve_conflict("commit");
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char *prepare_index(int argc, const char **argv, const char *prefix,
|
static const char *prepare_index(const char **argv, const char *prefix,
|
||||||
const struct commit *current_head, int is_status)
|
const struct commit *current_head, int is_status)
|
||||||
{
|
{
|
||||||
struct string_list partial = STRING_LIST_INIT_DUP;
|
struct string_list partial = STRING_LIST_INIT_DUP;
|
||||||
|
@ -378,7 +378,7 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
|
||||||
old_index_env = xstrdup_or_null(getenv(INDEX_ENVIRONMENT));
|
old_index_env = xstrdup_or_null(getenv(INDEX_ENVIRONMENT));
|
||||||
setenv(INDEX_ENVIRONMENT, the_repository->index_file, 1);
|
setenv(INDEX_ENVIRONMENT, the_repository->index_file, 1);
|
||||||
|
|
||||||
if (interactive_add(argc, argv, prefix, patch_interactive) != 0)
|
if (interactive_add(argv, prefix, patch_interactive) != 0)
|
||||||
die(_("interactive add failed"));
|
die(_("interactive add failed"));
|
||||||
|
|
||||||
the_repository->index_file = old_repo_index_file;
|
the_repository->index_file = old_repo_index_file;
|
||||||
|
@ -1241,13 +1241,13 @@ static int parse_and_validate_options(int argc, const char *argv[],
|
||||||
return argc;
|
return argc;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int dry_run_commit(int argc, const char **argv, const char *prefix,
|
static int dry_run_commit(const char **argv, const char *prefix,
|
||||||
const struct commit *current_head, struct wt_status *s)
|
const struct commit *current_head, struct wt_status *s)
|
||||||
{
|
{
|
||||||
int committable;
|
int committable;
|
||||||
const char *index_file;
|
const char *index_file;
|
||||||
|
|
||||||
index_file = prepare_index(argc, argv, prefix, current_head, 1);
|
index_file = prepare_index(argv, prefix, current_head, 1);
|
||||||
committable = run_status(stdout, index_file, prefix, 0, s);
|
committable = run_status(stdout, index_file, prefix, 0, s);
|
||||||
rollback_index_files();
|
rollback_index_files();
|
||||||
|
|
||||||
|
@ -1584,8 +1584,8 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
|
||||||
verbose = (config_commit_verbose < 0) ? 0 : config_commit_verbose;
|
verbose = (config_commit_verbose < 0) ? 0 : config_commit_verbose;
|
||||||
|
|
||||||
if (dry_run)
|
if (dry_run)
|
||||||
return dry_run_commit(argc, argv, prefix, current_head, &s);
|
return dry_run_commit(argv, prefix, current_head, &s);
|
||||||
index_file = prepare_index(argc, argv, prefix, current_head, 0);
|
index_file = prepare_index(argv, prefix, current_head, 0);
|
||||||
|
|
||||||
/* Set up everything for writing the commit object. This includes
|
/* Set up everything for writing the commit object. This includes
|
||||||
running hooks, writing the trees, and interacting with the user. */
|
running hooks, writing the trees, and interacting with the user. */
|
||||||
|
|
2
commit.h
2
commit.h
|
@ -248,7 +248,7 @@ struct oid_array;
|
||||||
struct ref;
|
struct ref;
|
||||||
int for_each_commit_graft(each_commit_graft_fn, void *);
|
int for_each_commit_graft(each_commit_graft_fn, void *);
|
||||||
|
|
||||||
int interactive_add(int argc, const char **argv, const char *prefix, int patch);
|
int interactive_add(const char **argv, const char *prefix, int patch);
|
||||||
int run_add_interactive(const char *revision, const char *patch_mode,
|
int run_add_interactive(const char *revision, const char *patch_mode,
|
||||||
const struct pathspec *pathspec);
|
const struct pathspec *pathspec);
|
||||||
|
|
||||||
|
|
|
@ -2580,8 +2580,8 @@ static int for_each_good_bisect_ref(struct ref_store *refs, each_ref_fn fn, void
|
||||||
}
|
}
|
||||||
|
|
||||||
static int handle_revision_pseudo_opt(const char *submodule,
|
static int handle_revision_pseudo_opt(const char *submodule,
|
||||||
struct rev_info *revs,
|
struct rev_info *revs,
|
||||||
int argc, const char **argv, int *flags)
|
const char **argv, int *flags)
|
||||||
{
|
{
|
||||||
const char *arg = argv[0];
|
const char *arg = argv[0];
|
||||||
const char *optarg;
|
const char *optarg;
|
||||||
|
@ -2752,7 +2752,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
|
||||||
int opts;
|
int opts;
|
||||||
|
|
||||||
opts = handle_revision_pseudo_opt(submodule,
|
opts = handle_revision_pseudo_opt(submodule,
|
||||||
revs, argc - i, argv + i,
|
revs, argv + i,
|
||||||
&flags);
|
&flags);
|
||||||
if (opts > 0) {
|
if (opts > 0) {
|
||||||
i += opts - 1;
|
i += opts - 1;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#include "test-tool.h"
|
#include "test-tool.h"
|
||||||
#include "submodule-config.h"
|
#include "submodule-config.h"
|
||||||
|
|
||||||
static void die_usage(int argc, const char **argv, const char *msg)
|
static void die_usage(const char **argv, const char *msg)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "%s\n", msg);
|
fprintf(stderr, "%s\n", msg);
|
||||||
fprintf(stderr, "Usage: %s <submodulepath> <config name>\n", argv[0]);
|
fprintf(stderr, "Usage: %s <submodulepath> <config name>\n", argv[0]);
|
||||||
|
@ -14,13 +14,13 @@ int cmd__submodule_nested_repo_config(int argc, const char **argv)
|
||||||
const struct submodule *sub;
|
const struct submodule *sub;
|
||||||
|
|
||||||
if (argc < 3)
|
if (argc < 3)
|
||||||
die_usage(argc, argv, "Wrong number of arguments.");
|
die_usage(argv, "Wrong number of arguments.");
|
||||||
|
|
||||||
setup_git_directory();
|
setup_git_directory();
|
||||||
|
|
||||||
sub = submodule_from_path(the_repository, &null_oid, argv[1]);
|
sub = submodule_from_path(the_repository, &null_oid, argv[1]);
|
||||||
if (repo_submodule_init(&subrepo, the_repository, sub)) {
|
if (repo_submodule_init(&subrepo, the_repository, sub)) {
|
||||||
die_usage(argc, argv, "Submodule not found.");
|
die_usage(argv, "Submodule not found.");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Read the config of _child_ submodules. */
|
/* Read the config of _child_ submodules. */
|
||||||
|
|
Loading…
Reference in New Issue