Merge pull request #30 from jow-/rework-number-handling

treewide: rework numeric value handling

1 files changed, 8 insertions, 66 deletions

diff --git a/lib/rtnl.c b/lib/rtnl.c
index 2393264..4d5cc02 100644
--- a/lib/rtnl.c
+++ b/lib/rtnl.c
@@ -97,29 +97,14 @@ typedef struct {
 static bool
 uc_nl_parse_u32(uc_value_t *val, uint32_t *n)
 {
-	uc_type_t t;
-	int64_t i;
-	double d;
-
-	t = ucv_cast_number(val, &i, &d);
-
-	if (t == UC_DOUBLE) {
-		if (isnan(d) || d < 0 || d > UINT32_MAX)
-			return false;
-
-		i = (int64_t)d;
+	uint64_t u;
 
-		if (d - i > 0)
-			return false;
-	}
-	else if (errno != 0) {
-		return false;
-	}
+	u = ucv_to_unsigned(val);
 
-	if (i < 0 || i > UINT32_MAX)
+	if (errno != 0 || u > UINT32_MAX)
 		return false;
 
-	*n = (uint32_t)i;
+	*n = (uint32_t)u;
 
 	return true;
 }
@@ -127,26 +112,11 @@ uc_nl_parse_u32(uc_value_t *val, uint32_t *n)
 static bool
 uc_nl_parse_s32(uc_value_t *val, uint32_t *n)
 {
-	uc_type_t t;
 	int64_t i;
-	double d;
-
-	t = ucv_cast_number(val, &i, &d);
-
-	if (t == UC_DOUBLE) {
-		if (isnan(d) || d < INT32_MIN || d > INT32_MAX)
-			return false;
-
-		i = (int64_t)d;
 
-		if (d - i > 0)
-			return false;
-	}
-	else if (errno != 0) {
-		return false;
-	}
+	i = ucv_to_integer(val);
 
-	if (i < INT32_MIN || i > INT32_MAX)
+	if (errno != 0 || i < INT32_MIN || i > INT32_MAX)
 		return false;
 
 	*n = (uint32_t)i;
@@ -157,37 +127,9 @@ uc_nl_parse_s32(uc_value_t *val, uint32_t *n)
 static bool
 uc_nl_parse_u64(uc_value_t *val, uint64_t *n)
 {
-	uc_type_t t;
-	int64_t i;
-	double d;
-
-	if (ucv_type(val) == UC_INTEGER) {
-		*n = ucv_uint64_get(val);
-
-		return true;
-	}
-
-	t = ucv_cast_number(val, &i, &d);
+	*n = ucv_to_unsigned(val);
 
-	if (t == UC_DOUBLE) {
-		if (isnan(d) || d < 0)
-			return false;
-
-		i = (int64_t)d;
-
-		if (d - i > 0)
-			return false;
-	}
-	else if (errno != 0) {
-		return false;
-	}
-
-	if (i < 0)
-		return false;
-
-	*n = (uint64_t)i;
-
-	return true;
+	return (errno == 0);
 }
 
 static const char *