From patchwork Wed Oct 26 19:04:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 79499 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp226854qge; Wed, 26 Oct 2016 12:05:55 -0700 (PDT) X-Received: by 10.98.73.203 with SMTP id r72mr6969420pfi.4.1477508755549; Wed, 26 Oct 2016 12:05:55 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id ed8si3423811pad.307.2016.10.26.12.05.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Oct 2016 12:05:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id A3E241A1EF2; Wed, 26 Oct 2016 12:05:40 -0700 (PDT) X-Original-To: edk2-devel@ml01.01.org Delivered-To: edk2-devel@ml01.01.org Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 67B0D1A1ED6 for ; Wed, 26 Oct 2016 12:05:39 -0700 (PDT) Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 05E15335EAE; Wed, 26 Oct 2016 19:05:39 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-27.phx2.redhat.com [10.3.116.27]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u9QJ57xo025834; Wed, 26 Oct 2016 15:05:38 -0400 From: Laszlo Ersek To: edk2-devel-01 Date: Wed, 26 Oct 2016 21:04:31 +0200 Message-Id: <20161026190504.9888-15-lersek@redhat.com> In-Reply-To: <20161026190504.9888-1-lersek@redhat.com> References: <20161026190504.9888-1-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 26 Oct 2016 19:05:39 +0000 (UTC) Subject: [edk2] [PATCH 14/47] FatPkg/EnhancedFatDxe: rebase to ARRAY_SIZE() X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ruiyu Ni MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Cc: Ruiyu Ni Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek --- FatPkg/EnhancedFatDxe/DirectoryManage.c | 4 ++-- FatPkg/EnhancedFatDxe/FileName.c | 4 ++-- FatPkg/EnhancedFatDxe/Hash.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) -- 2.9.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Ruiyu Ni diff --git a/FatPkg/EnhancedFatDxe/DirectoryManage.c b/FatPkg/EnhancedFatDxe/DirectoryManage.c index 91e7599e2722..3328ae31fed9 100644 --- a/FatPkg/EnhancedFatDxe/DirectoryManage.c +++ b/FatPkg/EnhancedFatDxe/DirectoryManage.c @@ -118,7 +118,7 @@ Returns: SetMem (LfnBuffer, sizeof (CHAR16) * LFN_CHAR_TOTAL * EntryCount, 0xff); Status = StrCpyS ( LfnBuffer, - sizeof (LfnBuffer) / sizeof (LfnBuffer[0]), + ARRAY_SIZE (LfnBuffer), DirEnt->FileString ); if (EFI_ERROR (Status)) { @@ -360,7 +360,7 @@ Returns: FatGetFileNameViaCaseFlag ( DirEnt, LfnBuffer, - sizeof (LfnBuffer) / sizeof (LfnBuffer[0]) + ARRAY_SIZE (LfnBuffer) ); } diff --git a/FatPkg/EnhancedFatDxe/FileName.c b/FatPkg/EnhancedFatDxe/FileName.c index 551cda53b9a4..5df403625d64 100644 --- a/FatPkg/EnhancedFatDxe/FileName.c +++ b/FatPkg/EnhancedFatDxe/FileName.c @@ -310,7 +310,7 @@ Returns: // Lower case a copy of the string, if it matches the // original then the string is lower case // - StrCpyS (Buffer, sizeof (Buffer) / sizeof (Buffer[0]), Str); + StrCpyS (Buffer, ARRAY_SIZE (Buffer), Str); FatStrLwr (Buffer); if (StrCmp (Str, Buffer) == 0) { OutCaseFlag = InCaseFlag; @@ -319,7 +319,7 @@ Returns: // Upper case a copy of the string, if it matches the // original then the string is upper case // - StrCpyS (Buffer, sizeof (Buffer) / sizeof (Buffer[0]), Str); + StrCpyS (Buffer, ARRAY_SIZE (Buffer), Str); FatStrUpr (Buffer); if (StrCmp (Str, Buffer) == 0) { OutCaseFlag = 0; diff --git a/FatPkg/EnhancedFatDxe/Hash.c b/FatPkg/EnhancedFatDxe/Hash.c index 3d0ffe6fb879..f827368ef5eb 100644 --- a/FatPkg/EnhancedFatDxe/Hash.c +++ b/FatPkg/EnhancedFatDxe/Hash.c @@ -49,9 +49,9 @@ Returns: CHAR16 UpCasedLongFileName[EFI_PATH_STRING_LENGTH]; StrnCpyS ( UpCasedLongFileName, - sizeof (UpCasedLongFileName) / sizeof (UpCasedLongFileName[0]), + ARRAY_SIZE (UpCasedLongFileName), LongNameString, - sizeof (UpCasedLongFileName) / sizeof (UpCasedLongFileName[0]) - 1 + ARRAY_SIZE (UpCasedLongFileName) - 1 ); FatStrUpr (UpCasedLongFileName); gBS->CalculateCrc32 (UpCasedLongFileName, StrSize (UpCasedLongFileName), &HashValue);