From patchwork Mon Dec 17 01:49:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liguang X-Patchwork-Id: 206767 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 024882C00B4 for ; Mon, 17 Dec 2012 12:52:31 +1100 (EST) Received: from localhost ([::1]:34235 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkPsa-0006It-Qq for incoming@patchwork.ozlabs.org; Sun, 16 Dec 2012 20:52:28 -0500 Received: from eggs.gnu.org ([208.118.235.92]:45977) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkPsO-0006Gt-NH for qemu-devel@nongnu.org; Sun, 16 Dec 2012 20:52:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TkPsN-00086y-K6 for qemu-devel@nongnu.org; Sun, 16 Dec 2012 20:52:16 -0500 Received: from [222.73.24.84] (port=26946 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkPsN-00086h-9n for qemu-devel@nongnu.org; Sun, 16 Dec 2012 20:52:15 -0500 X-IronPort-AV: E=Sophos;i="4.84,297,1355068800"; d="scan'208";a="6411165" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 17 Dec 2012 09:50:16 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id qBH1qeEW012122; Mon, 17 Dec 2012 09:52:40 +0800 Received: from liguang.fnst.cn.fujitsu.com ([10.167.225.128]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2012121709511194-446452 ; Mon, 17 Dec 2012 09:51:11 +0800 From: liguang To: stefanha@redhat.com, armbru@redhat.com, imammedo@redhat.com, qemu-devel@nongnu.org Date: Mon, 17 Dec 2012 09:49:22 +0800 Message-Id: <1355708963-17675-1-git-send-email-lig.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.7.2.5 X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/12/17 09:51:11, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/12/17 09:51:12, Serialize complete at 2012/12/17 09:51:12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Cc: liguang Subject: [Qemu-devel] [PATCH v3 1/2] cutils:change strtosz_suffix_unit function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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;