From patchwork Mon Jan 24 15:33:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jes Sorensen X-Patchwork-Id: 80181 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D2A431007D2 for ; Tue, 25 Jan 2011 02:34:58 +1100 (EST) Received: from localhost ([127.0.0.1]:49130 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PhORN-00088E-Lm for incoming@patchwork.ozlabs.org; Mon, 24 Jan 2011 10:34:49 -0500 Received: from [140.186.70.92] (port=59466 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PhOQH-00085n-4L for qemu-devel@nongnu.org; Mon, 24 Jan 2011 10:33:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PhOQE-0001H5-Pj for qemu-devel@nongnu.org; Mon, 24 Jan 2011 10:33:40 -0500 Received: from mx1.redhat.com ([209.132.183.28]:5704) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PhOQE-0001Gw-J5 for qemu-devel@nongnu.org; Mon, 24 Jan 2011 10:33:38 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id p0OFXaON018746 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 24 Jan 2011 10:33:37 -0500 Received: from red-feather.redhat.com (ovpn-113-34.phx2.redhat.com [10.3.113.34]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p0OFXXXj010003; Mon, 24 Jan 2011 10:33:36 -0500 From: Jes.Sorensen@redhat.com To: kwolf@redhat.com Date: Mon, 24 Jan 2011 16:33:29 +0100 Message-Id: <1295883211-18288-3-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1295883211-18288-1-git-send-email-Jes.Sorensen@redhat.com> References: <1295883211-18288-1-git-send-email-Jes.Sorensen@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 2/4] strtosz() use qemu_toupper() to simplify switch statement X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jes Sorensen Signed-off-by: Jes Sorensen --- cutils.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/cutils.c b/cutils.c index a067cf4..78d35e2 100644 --- a/cutils.c +++ b/cutils.c @@ -323,16 +323,14 @@ int64_t strtosz_suffix(const char *nptr, char **end, const char default_suffix) d = c; } } - switch (d) { + switch (qemu_toupper(d)) { case 'B': - case 'b': mul = 1; if (mul_required) { goto fail; } break; case 'K': - case 'k': mul = 1 << 10; break; case 0: @@ -340,15 +338,12 @@ int64_t strtosz_suffix(const char *nptr, char **end, const char default_suffix) goto fail; } case 'M': - case 'm': mul = 1ULL << 20; break; case 'G': - case 'g': mul = 1ULL << 30; break; case 'T': - case 't': mul = 1ULL << 40; break; default: