From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60652) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlLjl-0005OO-AA for qemu-devel@nongnu.org; Wed, 19 Dec 2012 10:39:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TlLji-0002Mg-9f for qemu-devel@nongnu.org; Wed, 19 Dec 2012 10:39:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47893) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlLji-0002MZ-2N for qemu-devel@nongnu.org; Wed, 19 Dec 2012 10:39:10 -0500 From: Stefan Hajnoczi Date: Wed, 19 Dec 2012 16:38:15 +0100 Message-Id: <1355931499-7912-15-git-send-email-stefanha@redhat.com> In-Reply-To: <1355931499-7912-1-git-send-email-stefanha@redhat.com> References: <1355931499-7912-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 14/18] cutils: change strtosz_suffix_unit function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori From: 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 Signed-off-by: Stefan Hajnoczi --- cutils.c | 6 ++++-- 1 file 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; -- 1.8.0.2