Make tables for DEFINE_STRING_TABLE_LOOKUP consistent

Bring some arrays that are used for DEFINE_STRING_TABLE_LOOKUP() in the
same order than the enums they reference.

Also, pass the corresponding _MAX value to the array initalizer where
appropriate.
This commit is contained in:
Daniel Mack
2014-03-07 21:38:48 +01:00
parent fe8d029277
commit 2c5859afec
9 changed files with 16 additions and 16 deletions
+2 -2
View File
@@ -31,7 +31,7 @@
#include "log.h"
#include "conf-parser.h"
static const char* const duplex_table[] = {
static const char* const duplex_table[_DUP_MAX] = {
[DUP_FULL] = "full",
[DUP_HALF] = "half"
};
@@ -39,7 +39,7 @@ static const char* const duplex_table[] = {
DEFINE_STRING_TABLE_LOOKUP(duplex, Duplex);
DEFINE_CONFIG_PARSE_ENUM(config_parse_duplex, duplex, Duplex, "Failed to parse duplex setting");
static const char* const wol_table[] = {
static const char* const wol_table[_WOL_MAX] = {
[WOL_PHY] = "phy",
[WOL_MAGIC] = "magic",
[WOL_OFF] = "off"
+2 -2
View File
@@ -466,7 +466,7 @@ int link_get_driver(link_config_ctx *ctx, struct udev_device *device, char **ret
return 0;
}
static const char* const mac_policy_table[] = {
static const char* const mac_policy_table[_MACPOLICY_MAX] = {
[MACPOLICY_PERSISTENT] = "persistent",
[MACPOLICY_RANDOM] = "random"
};
@@ -474,7 +474,7 @@ static const char* const mac_policy_table[] = {
DEFINE_STRING_TABLE_LOOKUP(mac_policy, MACPolicy);
DEFINE_CONFIG_PARSE_ENUM(config_parse_mac_policy, mac_policy, MACPolicy, "Failed to parse MAC address policy");
static const char* const name_policy_table[] = {
static const char* const name_policy_table[_NAMEPOLICY_MAX] = {
[NAMEPOLICY_DATABASE] = "database",
[NAMEPOLICY_ONBOARD] = "onboard",
[NAMEPOLICY_SLOT] = "slot",