admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

global: mark usage strings and string tables const

Browse Source 
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ahelenia Ziemiańska
2025-04-21 10:56:13 +02:00
committed by Junio C Hamano
parent 683c54c999
commit 86eef3541e
15 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/blame.c
View File

@@ -36,17 +36,17 @@
#include "tag.h" #include "tag.h"
#include "write-or-die.h" #include "write-or-die.h"
static char blame_usage[] = N_("git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"); static const char blame_usage[] = N_("git blame [<options>] [<rev-opts>] [<rev>] [--] <file>");
static char annotate_usage[] = N_("git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>"); static const char annotate_usage[] = N_("git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>");
static const char *blame_opt_usage[] = { static const char *const blame_opt_usage[] = {
blame_usage, blame_usage,
"", "",
N_("<rev-opts> are documented in git-rev-list(1)"), N_("<rev-opts> are documented in git-rev-list(1)"),
NULL NULL
}; };
static const char *annotate_opt_usage[] = { static const char *const annotate_opt_usage[] = {
annotate_usage, annotate_usage,
"", "",
N_("<rev-opts> are documented in git-rev-list(1)"), N_("<rev-opts> are documented in git-rev-list(1)"),
@@ -929,7 +929,7 @@ int cmd_blame(int argc,
long anchor; long anchor;
long num_lines = 0; long num_lines = 0;
const char *str_usage = cmd_is_annotate ? annotate_usage : blame_usage; const char *str_usage = cmd_is_annotate ? annotate_usage : blame_usage;
const char **opt_usage = cmd_is_annotate ? annotate_opt_usage : blame_opt_usage; const char *const *opt_usage = cmd_is_annotate ? annotate_opt_usage : blame_opt_usage;
setup_default_color_by_age(); setup_default_color_by_age();
git_config(git_blame_config, &output_option); git_config(git_blame_config, &output_option);

4
builtin/commit-graph.c
View File

@@ -22,12 +22,12 @@
" [--changed-paths] [--[no-]max-new-filters <n>] [--[no-]progress]\n" \ " [--changed-paths] [--[no-]max-new-filters <n>] [--[no-]progress]\n" \
" <split-options>") " <split-options>")
static const char * builtin_commit_graph_verify_usage[] = { static const char * const builtin_commit_graph_verify_usage[] = {
BUILTIN_COMMIT_GRAPH_VERIFY_USAGE, BUILTIN_COMMIT_GRAPH_VERIFY_USAGE,
NULL NULL
}; };
static const char * builtin_commit_graph_write_usage[] = { static const char * const builtin_commit_graph_write_usage[] = {
BUILTIN_COMMIT_GRAPH_WRITE_USAGE, BUILTIN_COMMIT_GRAPH_WRITE_USAGE,
NULL NULL
}; };

2
builtin/fast-export.c
View File

@@ -30,7 +30,7 @@
#include "remote.h" #include "remote.h"
#include "blob.h" #include "blob.h"
static const char *fast_export_usage[] = { static const char *const fast_export_usage[] = {
N_("git fast-export [<rev-list-opts>]"), N_("git fast-export [<rev-list-opts>]"),
NULL NULL
}; };

2
builtin/mktree.c
View File

@@ -66,7 +66,7 @@ static void write_tree(struct object_id *oid)
strbuf_release(&buf); strbuf_release(&buf);
} }
static const char *mktree_usage[] = { static const char *const mktree_usage[] = {
"git mktree [-z] [--missing] [--batch]", "git mktree [-z] [--missing] [--batch]",
NULL NULL
}; };

2
builtin/pack-objects.c
View File

@@ -183,7 +183,7 @@ static inline void oe_set_delta_size(struct packing_data *pack,
#define SET_DELTA_CHILD(obj, val) oe_set_delta_child(&to_pack, obj, val) #define SET_DELTA_CHILD(obj, val) oe_set_delta_child(&to_pack, obj, val)
#define SET_DELTA_SIBLING(obj, val) oe_set_delta_sibling(&to_pack, obj, val) #define SET_DELTA_SIBLING(obj, val) oe_set_delta_sibling(&to_pack, obj, val)
static const char *pack_usage[] = { static const char *const pack_usage[] = {
N_("git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]"), N_("git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]"),
N_("git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]"), N_("git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]"),
NULL NULL

2
builtin/show-branch.c
View File

@@ -19,7 +19,7 @@
#include "date.h" #include "date.h"
#include "wildmatch.h" #include "wildmatch.h"
static const char* show_branch_usage[] = { static const char*const show_branch_usage[] = {
N_("git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" N_("git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
" [--current] [--color[=<when>] | --no-color] [--sparse]\n" " [--current] [--color[=<when>] | --no-color] [--sparse]\n"
" [--more=<n> | --list | --independent | --merge-base]\n" " [--more=<n> | --list | --independent | --merge-base]\n"

2
t/helper/test-bloom.c
View File

@@ -44,7 +44,7 @@ static void get_bloom_filter_for_commit(const struct object_id *commit_oid)
print_bloom_filter(filter); print_bloom_filter(filter);
} }
static const char *bloom_usage = "\n" static const char *const bloom_usage = "\n"
" test-tool bloom get_murmur3 <string>\n" " test-tool bloom get_murmur3 <string>\n"
" test-tool bloom get_murmur3_seven_highbit\n" " test-tool bloom get_murmur3_seven_highbit\n"
" test-tool bloom generate_filter <string> [<string>...]\n" " test-tool bloom generate_filter <string> [<string>...]\n"

2
t/helper/test-date.c
View File

@@ -2,7 +2,7 @@
#include "date.h" #include "date.h"
#include "trace.h" #include "trace.h"
static const char *usage_msg = "\n" static const char *const usage_msg = "\n"
" test-tool date relative [time_t]...\n" " test-tool date relative [time_t]...\n"
" test-tool date human [time_t]...\n" " test-tool date human [time_t]...\n"
" test-tool date show:<format> [time_t]...\n" " test-tool date show:<format> [time_t]...\n"

2
t/helper/test-find-pack.c
View File

@@ -15,7 +15,7 @@
* packfiles containing the object is not <n>. * packfiles containing the object is not <n>.
*/ */
static const char *find_pack_usage[] = { static const char *const find_pack_usage[] = {
"test-tool find-pack [--check-count <n>] <object>", "test-tool find-pack [--check-count <n>] <object>",
NULL NULL
}; };

2
t/helper/test-getcwd.c
View File

@@ -2,7 +2,7 @@
#include "git-compat-util.h" #include "git-compat-util.h"
#include "parse-options.h" #include "parse-options.h"
static const char *getcwd_usage[] = { static const char *const getcwd_usage[] = {
"test-tool getcwd", "test-tool getcwd",
NULL NULL
}; };

2
t/helper/test-pack-mtimes.c
View File

@@ -24,7 +24,7 @@ static void dump_mtimes(struct packed_git *p)
} }
} }
static const char *pack_mtimes_usage = "\n" static const char *const pack_mtimes_usage = "\n"
" test-tool pack-mtimes <pack-name.mtimes>"; " test-tool pack-mtimes <pack-name.mtimes>";
int cmd__pack_mtimes(int argc, const char **argv) int cmd__pack_mtimes(int argc, const char **argv)

2
t/helper/test-proc-receive.c
View File

@@ -6,7 +6,7 @@
#include "sigchain.h" #include "sigchain.h"
#include "string-list.h" #include "string-list.h"
static const char *proc_receive_usage[] = { static const char *const proc_receive_usage[] = {
"test-tool proc-receive [<options>]", "test-tool proc-receive [<options>]",
NULL NULL
}; };

2
t/helper/test-rot13-filter.c
View File

@@ -324,7 +324,7 @@ static void packet_initialize(void)
packet_flush(1); packet_flush(1);
} }
static const char *rot13_usage[] = { static const char *const rot13_usage[] = {
"test-tool rot13-filter [--always-delay] --log=<path> <capabilities>", "test-tool rot13-filter [--always-delay] --log=<path> <capabilities>",
NULL NULL
}; };

10
t/helper/test-submodule.c
View File

@@ -12,33 +12,33 @@
#define TEST_TOOL_CHECK_NAME_USAGE \ #define TEST_TOOL_CHECK_NAME_USAGE \
"test-tool submodule check-name" "test-tool submodule check-name"
static const char *submodule_check_name_usage[] = { static const char *const submodule_check_name_usage[] = {
TEST_TOOL_CHECK_NAME_USAGE, TEST_TOOL_CHECK_NAME_USAGE,
NULL NULL
}; };
#define TEST_TOOL_CHECK_URL_USAGE \ #define TEST_TOOL_CHECK_URL_USAGE \
"test-tool submodule check-url" "test-tool submodule check-url"
static const char *submodule_check_url_usage[] = { static const char *const submodule_check_url_usage[] = {
TEST_TOOL_CHECK_URL_USAGE, TEST_TOOL_CHECK_URL_USAGE,
NULL NULL
}; };
#define TEST_TOOL_IS_ACTIVE_USAGE \ #define TEST_TOOL_IS_ACTIVE_USAGE \
"test-tool submodule is-active <name>" "test-tool submodule is-active <name>"
static const char *submodule_is_active_usage[] = { static const char *const submodule_is_active_usage[] = {
TEST_TOOL_IS_ACTIVE_USAGE, TEST_TOOL_IS_ACTIVE_USAGE,
NULL NULL
}; };
#define TEST_TOOL_RESOLVE_RELATIVE_URL_USAGE \ #define TEST_TOOL_RESOLVE_RELATIVE_URL_USAGE \
"test-tool submodule resolve-relative-url <up_path> <remoteurl> <url>" "test-tool submodule resolve-relative-url <up_path> <remoteurl> <url>"
static const char *submodule_resolve_relative_url_usage[] = { static const char *const submodule_resolve_relative_url_usage[] = {
TEST_TOOL_RESOLVE_RELATIVE_URL_USAGE, TEST_TOOL_RESOLVE_RELATIVE_URL_USAGE,
NULL, NULL,
}; };
static const char *submodule_usage[] = { static const char *const submodule_usage[] = {
TEST_TOOL_CHECK_NAME_USAGE, TEST_TOOL_CHECK_NAME_USAGE,
TEST_TOOL_CHECK_URL_USAGE, TEST_TOOL_CHECK_URL_USAGE,
TEST_TOOL_IS_ACTIVE_USAGE, TEST_TOOL_IS_ACTIVE_USAGE,

2
t/helper/test-windows-named-pipe.c
View File

@@ -3,7 +3,7 @@
#include "strbuf.h" #include "strbuf.h"
#ifdef GIT_WINDOWS_NATIVE #ifdef GIT_WINDOWS_NATIVE
static const char *usage_string = "<pipe-filename>"; static const char *const usage_string = "<pipe-filename>";
#define TEST_BUFSIZE (4096) #define TEST_BUFSIZE (4096)