From 37edbf7ea8067262a5c3d8bbe4786139348c8311 Mon Sep 17 00:00:00 2001 From: liguang Date: Mon, 17 Dec 2012 09:49:22 +0800 Subject: cutils: change strtosz_suffix_unit function if value to be translated is larger than INT64_MAX, this function will not be convenient for caller to be aware of it, so change a little for this. Signed-off-by: liguang Signed-off-by: Stefan Hajnoczi --- cutils.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'cutils.c') diff --git a/cutils.c b/cutils.c index d06590b330..80bb1dcbf7 100644 --- a/cutils.c +++ b/cutils.c @@ -214,12 +214,13 @@ static int64_t suffix_mul(char suffix, int64_t unit) /* * Convert string to bytes, allowing either B/b for bytes, K/k for KB, * M/m for MB, G/g for GB or T/t for TB. End pointer will be returned - * in *end, if not NULL. Return -1 on error. + * in *end, if not NULL. Return -ERANGE on overflow, Return -EINVAL on + * other error. */ int64_t strtosz_suffix_unit(const char *nptr, char **end, const char default_suffix, int64_t unit) { - int64_t retval = -1; + int64_t retval = -EINVAL; char *endptr; unsigned char c; int mul_required = 0; @@ -246,6 +247,7 @@ int64_t strtosz_suffix_unit(const char *nptr, char **end, goto fail; } if ((val * mul >= INT64_MAX) || val < 0) { + retval = -ERANGE; goto fail; } retval = val * mul; -- cgit v1.2.1