From ce3e9428acbcb7fe6b7a7fc4f0f0fa863917ebcf Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 30 Oct 2023 17:53:58 +0100 Subject: [PATCH] network-generator: name enum for "ip=dhcp" case same as literal string Let's make this less confusing, and use the same string externally as enum name internally. --- src/network/generator/network-generator.c | 4 ++-- src/network/generator/network-generator.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c index f1bcc32591..0819d4432c 100644 --- a/src/network/generator/network-generator.c +++ b/src/network/generator/network-generator.c @@ -48,7 +48,7 @@ static const char * const dracut_dhcp_type_table[_DHCP_TYPE_MAX] = { [DHCP_TYPE_OFF] = "off", [DHCP_TYPE_ON] = "on", [DHCP_TYPE_ANY] = "any", - [DHCP_TYPE_DHCP4] = "dhcp", + [DHCP_TYPE_DHCP] = "dhcp", [DHCP_TYPE_DHCP6] = "dhcp6", [DHCP_TYPE_AUTO6] = "auto6", [DHCP_TYPE_EITHER6] = "either6", @@ -63,7 +63,7 @@ static const char * const networkd_dhcp_type_table[_DHCP_TYPE_MAX] = { [DHCP_TYPE_OFF] = "no", [DHCP_TYPE_ON] = "yes", [DHCP_TYPE_ANY] = "yes", - [DHCP_TYPE_DHCP4] = "ipv4", + [DHCP_TYPE_DHCP] = "ipv4", [DHCP_TYPE_DHCP6] = "ipv6", [DHCP_TYPE_AUTO6] = "no", /* TODO: enable other setting? */ [DHCP_TYPE_EITHER6] = "ipv6", /* TODO: enable other setting? */ diff --git a/src/network/generator/network-generator.h b/src/network/generator/network-generator.h index 0e0da2a57a..7350933d69 100644 --- a/src/network/generator/network-generator.h +++ b/src/network/generator/network-generator.h @@ -10,10 +10,10 @@ typedef enum DHCPType { DHCP_TYPE_NONE, - DHCP_TYPE_OFF, + DHCP_TYPE_OFF, /* Same as DHCP_TYPE_NONE */ DHCP_TYPE_ON, - DHCP_TYPE_ANY, - DHCP_TYPE_DHCP4, + DHCP_TYPE_ANY, /* Same as DHCP_TYPE_ON */ + DHCP_TYPE_DHCP, /* Actually means: DHCPv4 */ DHCP_TYPE_DHCP6, DHCP_TYPE_AUTO6, DHCP_TYPE_EITHER6, -- 2.25.1