From 22001cb206c1320aee27f679a63d2171d35e99c5 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Tue, 3 Dec 2013 16:48:56 +0000 Subject: [settings] Explicitly separate the concept of a completed fetched setting The fetch_setting() family of functions may currently modify the definition of the specified setting (e.g. to add missing type information). Clean up this interface by requiring callers to provide an explicit buffer to contain the completed definition of the fetched setting, if required. Signed-off-by: Michael Brown --- src/net/ipv4.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/net/ipv4.c') diff --git a/src/net/ipv4.c b/src/net/ipv4.c index 438fe9ac5..f0a2e4d65 100644 --- a/src/net/ipv4.c +++ b/src/net/ipv4.c @@ -591,7 +591,7 @@ struct sockaddr_converter ipv4_sockaddr_converter __sockaddr_converter = { */ /** IPv4 address setting */ -struct setting ip_setting __setting ( SETTING_IPv4 ) = { +const struct setting ip_setting __setting ( SETTING_IPv4 ) = { .name = "ip", .description = "IP address", .tag = DHCP_EB_YIADDR, @@ -599,7 +599,7 @@ struct setting ip_setting __setting ( SETTING_IPv4 ) = { }; /** IPv4 subnet mask setting */ -struct setting netmask_setting __setting ( SETTING_IPv4 ) = { +const struct setting netmask_setting __setting ( SETTING_IPv4 ) = { .name = "netmask", .description = "Subnet mask", .tag = DHCP_SUBNET_MASK, @@ -607,7 +607,7 @@ struct setting netmask_setting __setting ( SETTING_IPv4 ) = { }; /** Default gateway setting */ -struct setting gateway_setting __setting ( SETTING_IPv4 ) = { +const struct setting gateway_setting __setting ( SETTING_IPv4 ) = { .name = "gateway", .description = "Default gateway", .tag = DHCP_ROUTERS, -- cgit v1.2.3-55-g7522