From 4f506328ad93a3bbe54028f432d7db6e7ee25faa Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 20 Dec 2006 03:33:37 +0000 Subject: [PATCH] Use -ENOSPC rather than -ENOMEM, to distinguish the cases "generic out of memory" and "no space left for DHCP options" --- src/core/settings.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/settings.c b/src/core/settings.c index 3eface4b..22b1dafc 100644 --- a/src/core/settings.c +++ b/src/core/settings.c @@ -212,7 +212,7 @@ static int set_string ( struct config_context *context, option = set_dhcp_option ( context->options, setting->tag, value, strlen ( value ) ); if ( ! option ) - return -ENOMEM; + return -ENOSPC; return 0; } @@ -261,12 +261,12 @@ static int set_ipv4 ( struct config_context *context, struct in_addr ipv4; int rc; - if ( ( rc = inet_aton ( value, &ipv4 ) ) == 0 ) - return rc; + if ( inet_aton ( value, &ipv4 ) == 0 ) + return -EINVAL; option = set_dhcp_option ( context->options, setting->tag, &ipv4, sizeof ( ipv4 ) ); if ( ! option ) - return -ENOMEM; + return -ENOSPC; return 0; } @@ -330,7 +330,7 @@ static int set_int ( struct config_context *context, option = set_dhcp_option ( context->options, setting->tag, &u.bytes[ sizeof ( u ) - size ], size ); if ( ! option ) - return -ENOMEM; + return -ENOSPC; return 0; }