picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tree-wide: constify a few static string tables

This commit is contained in:
Lennart Poettering 2019-03-22 19:19:32 +01:00 committed by Zbigniew Jędrzejewski-Szmek
parent ebfb1b5724
commit b82f71c7ff
11 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/basic/cgroup-util.c
View File

@ -2871,7 +2871,7 @@ bool fd_is_cgroup_fs(int fd) {
return is_cgroup_fs(&s);
}
static const char *cgroup_controller_table[_CGROUP_CONTROLLER_MAX] = {
static const char *const cgroup_controller_table[_CGROUP_CONTROLLER_MAX] = {
[CGROUP_CONTROLLER_CPU] = "cpu",
[CGROUP_CONTROLLER_CPUACCT] = "cpuacct",
[CGROUP_CONTROLLER_IO] = "io",

6
src/core/manager.c
View File

@ -3787,7 +3787,7 @@ static bool generator_path_any(const char* const* paths) {
return found;
}
static const char* system_env_generator_binary_paths[] = {
static const char *const system_env_generator_binary_paths[] = {
"/run/systemd/system-environment-generators",
"/etc/systemd/system-environment-generators",
"/usr/local/lib/systemd/system-environment-generators",
@ -3795,7 +3795,7 @@ static const char* system_env_generator_binary_paths[] = {
NULL
};
static const char* user_env_generator_binary_paths[] = {
static const char *const user_env_generator_binary_paths[] = {
"/run/systemd/user-environment-generators",
"/etc/systemd/user-environment-generators",
"/usr/local/lib/systemd/user-environment-generators",
@ -3805,7 +3805,7 @@ static const char* user_env_generator_binary_paths[] = {
static int manager_run_environment_generators(Manager *m) {
char **tmp = NULL; /* this is only used in the forked process, no cleanup here */
const char **paths;
const char *const *paths;
void* args[] = {
[STDOUT_GENERATE] = &tmp,
[STDOUT_COLLECT] = &tmp,

2
src/core/unit.c
View File

@ -3195,7 +3195,7 @@ static int serialize_cgroup_mask(FILE *f, const char *key, CGroupMask mask) {
return serialize_item(f, key, s);
}
static const char *ip_accounting_metric_field[_CGROUP_IP_ACCOUNTING_METRIC_MAX] = {
static const char *const ip_accounting_metric_field[_CGROUP_IP_ACCOUNTING_METRIC_MAX] = {
[CGROUP_IP_INGRESS_BYTES] = "ip-accounting-ingress-bytes",
[CGROUP_IP_INGRESS_PACKETS] = "ip-accounting-ingress-packets",
[CGROUP_IP_EGRESS_BYTES] = "ip-accounting-egress-bytes",

2
src/network/netdev/bond.c
View File

@ -116,7 +116,7 @@ static const char *const bond_arp_all_targets_table[_NETDEV_BOND_ARP_ALL_TARGETS
DEFINE_STRING_TABLE_LOOKUP(bond_arp_all_targets, BondArpAllTargets);
DEFINE_CONFIG_PARSE_ENUM(config_parse_bond_arp_all_targets, bond_arp_all_targets, BondArpAllTargets, "Failed to parse bond Arp all targets");
static const char *bond_primary_reselect_table[_NETDEV_BOND_PRIMARY_RESELECT_MAX] = {
static const char *const bond_primary_reselect_table[_NETDEV_BOND_PRIMARY_RESELECT_MAX] = {
[NETDEV_BOND_PRIMARY_RESELECT_ALWAYS] = "always",
[NETDEV_BOND_PRIMARY_RESELECT_BETTER]= "better",
[NETDEV_BOND_PRIMARY_RESELECT_FAILURE]= "failure",

2
src/shared/install.c
View File

@ -117,7 +117,7 @@ bool unit_type_may_template(UnitType type) {
UNIT_PATH);
}
static const char *unit_file_type_table[_UNIT_FILE_TYPE_MAX] = {
static const char *const unit_file_type_table[_UNIT_FILE_TYPE_MAX] = {
[UNIT_FILE_TYPE_REGULAR] = "regular",
[UNIT_FILE_TYPE_SYMLINK] = "symlink",
[UNIT_FILE_TYPE_MASKED] = "masked",

9
src/test/test-path-util.c
View File

@ -179,7 +179,14 @@ static void test_find_binary(const char *self) {
}
static void test_prefixes(void) {
static const char* values[] = { "/a/b/c/d", "/a/b/c", "/a/b", "/a", "", NULL};
static const char* const values[] = {
"/a/b/c/d",
"/a/b/c",
"/a/b",
"/a",
"",
NULL
};
unsigned i;
char s[PATH_MAX];
bool b;

2
src/tmpfiles/tmpfiles.c
View File

@ -1504,7 +1504,7 @@ typedef enum {
_CREATION_MODE_INVALID = -1
} CreationMode;
static const char *creation_mode_verb_table[_CREATION_MODE_MAX] = {
static const char *const creation_mode_verb_table[_CREATION_MODE_MAX] = {
[CREATION_NORMAL] = "Created",
[CREATION_EXISTING] = "Found existing",
[CREATION_FORCE] = "Created replacement",

2
src/udev/cdrom_id/cdrom_id.c
View File

@ -585,7 +585,7 @@ out:
static int cd_media_info(int fd) {
struct scsi_cmd sc;
unsigned char header[32];
static const char *media_status[] = {
static const char *const media_status[] = {
"blank",
"appendable",
"complete",

2
src/udev/udev-builtin.c
View File

@ -12,7 +12,7 @@
static bool initialized;
static const struct udev_builtin *builtins[_UDEV_BUILTIN_MAX] = {
static const struct udev_builtin *const builtins[_UDEV_BUILTIN_MAX] = {
#if HAVE_BLKID
[UDEV_BUILTIN_BLKID] = &udev_builtin_blkid,
#endif

6
src/udev/udev-rules.c
View File

@ -219,7 +219,7 @@ struct rule_tmp {
#if ENABLE_DEBUG_UDEV
static const char *operation_str(enum operation_type type) {
static const char *operation_strs[] = {
static const char *const operation_strs[] = {
[OP_UNSET] = "UNSET",
[OP_MATCH] = "match",
[OP_NOMATCH] = "nomatch",
@ -235,7 +235,7 @@ static const char *operation_str(enum operation_type type) {
}
static const char *string_glob_str(enum string_glob_type type) {
static const char *string_glob_strs[] = {
static const char *const string_glob_strs[] = {
[GL_UNSET] = "UNSET",
[GL_PLAIN] = "plain",
[GL_GLOB] = "glob",
@ -248,7 +248,7 @@ static const char *string_glob_str(enum string_glob_type type) {
}
static const char *token_str(enum token_type type) {
static const char *token_strs[] = {
static const char *const token_strs[] = {
[TK_UNSET] = "UNSET",
[TK_RULE] = "RULE",

2
src/udev/udevadm.c
View File

@ -16,7 +16,7 @@
#include "util.h"
static int help(void) {
static const char * short_descriptions[][2] = {
static const char *const short_descriptions[][2] = {
{ "info", "Query sysfs or the udev database" },
{ "trigger", "Request events from the kernel" },
{ "settle", "Wait for pending udev events" },