From patchwork Mon Dec 17 01:49:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v3,1/2] cutils:change strtosz_suffix_unit function Date: Sun, 16 Dec 2012 15:49:22 -0000 From: liguang X-Patchwork-Id: 206767 Message-Id: <1355708963-17675-1-git-send-email-lig.fnst@cn.fujitsu.com> To: stefanha@redhat.com, armbru@redhat.com, imammedo@redhat.com, qemu-devel@nongnu.org Cc: liguang 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 --- cutils.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cutils.c b/cutils.c index 4f0692f..0433e05 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;