From patchwork Thu May 14 09:58:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Harkin X-Patchwork-Id: 48506 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f69.google.com (mail-wg0-f69.google.com [74.125.82.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3B08C2121F for ; Thu, 14 May 2015 09:59:23 +0000 (UTC) Received: by wgin8 with SMTP id n8sf17484057wgi.0 for ; Thu, 14 May 2015 02:59:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:subject :precedence:reply-to:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=ZsWNuZtzszXCAJLexuJvpSLzXHgbwq+lwp5jLo6quhg=; b=YhoX4aHQuOT1/79HWBu64OMHt/RNdV4KdkjbgwWYlCoiW/3DqlpggVaMjbvByOFLgM kBHaiVUI904k7/0XhQFnstlGNZcHkqmvCH2ZuLLLKkD/+iv890ahCgtNMT3mw5WfeR4w Waaq6bFhC99gTG/UsRNHthZ3Bae8sJdWArP5MoCI0NBIA7L9iZ0c+Kz43KzdSWL0wsRy zODkIQ14soHTlknH8QPsgzkq1xCQ+8CU8u31UuOTkzYXNPqNuM2a16mndwldBKPpObEl Rn825OxgTbuIt4HhSshcM6GTVeYDtTN8yLM45ffynk9pq3cEkPzLptKfM5H17H0z46ni W3Gw== X-Gm-Message-State: ALoCoQne4EG97yQS/9xFRv0HizkHFVPz97bZaMEjV+3njFGNLOJBIga8Wo7DRqrlucHQaumcVj0f X-Received: by 10.112.189.131 with SMTP id gi3mr2515035lbc.6.1431597562409; Thu, 14 May 2015 02:59:22 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.179.39 with SMTP id dd7ls404665lac.60.gmail; Thu, 14 May 2015 02:59:22 -0700 (PDT) X-Received: by 10.112.145.136 with SMTP id su8mr2497507lbb.61.1431597562170; Thu, 14 May 2015 02:59:22 -0700 (PDT) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id u7si14194568lae.10.2015.05.14.02.59.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 May 2015 02:59:21 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received: by laat2 with SMTP id t2so60085498laa.1 for ; Thu, 14 May 2015 02:59:21 -0700 (PDT) X-Received: by 10.152.36.2 with SMTP id m2mr2510313laj.72.1431597561677; Thu, 14 May 2015 02:59:21 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp1135343lbb; Thu, 14 May 2015 02:59:21 -0700 (PDT) X-Received: by 10.43.92.199 with SMTP id br7mr1236728icc.43.1431597560256; Thu, 14 May 2015 02:59:20 -0700 (PDT) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id ba5si347495icc.39.2015.05.14.02.59.19 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 14 May 2015 02:59:20 -0700 (PDT) Received-SPF: pass (google.com: domain of edk2-devel-bounces@lists.sourceforge.net designates 216.34.181.88 as permitted sender) client-ip=216.34.181.88; Received: from localhost ([127.0.0.1] helo=sfs-ml-2.v29.ch3.sourceforge.com) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1Yspv4-0005Qm-8t; Thu, 14 May 2015 09:59:10 +0000 Received: from sog-mx-4.v43.ch3.sourceforge.com ([172.29.43.194] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1Yspv2-0005Qg-My for edk2-devel@lists.sourceforge.net; Thu, 14 May 2015 09:59:08 +0000 Received-SPF: pass (sog-mx-4.v43.ch3.sourceforge.com: domain of linaro.org designates 74.125.82.53 as permitted sender) client-ip=74.125.82.53; envelope-from=ryan.harkin@linaro.org; helo=mail-wg0-f53.google.com; Received: from mail-wg0-f53.google.com ([74.125.82.53]) by sog-mx-4.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1Yspv1-0007ck-P8 for edk2-devel@lists.sourceforge.net; Thu, 14 May 2015 09:59:08 +0000 Received: by wgin8 with SMTP id n8so69790383wgi.0 for ; Thu, 14 May 2015 02:59:01 -0700 (PDT) X-Received: by 10.180.215.101 with SMTP id oh5mr23056716wic.6.1431597541796; Thu, 14 May 2015 02:59:01 -0700 (PDT) Received: from localhost.localdomain (82-69-54-187.dsl.in-addr.zen.co.uk. [82.69.54.187]) by mx.google.com with ESMTPSA id lh8sm25369449wjc.23.2015.05.14.02.59.00 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 14 May 2015 02:59:01 -0700 (PDT) From: Ryan Harkin To: edk2-devel@lists.sourceforge.net, eric.dong@intel.com Date: Thu, 14 May 2015 10:58:51 +0100 Message-Id: <1431597531-26785-1-git-send-email-ryan.harkin@linaro.org> X-Mailer: git-send-email 2.1.0 X-Spam-Score: -1.5 (-) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1Yspv1-0007ck-P8 Subject: [edk2] [PATCH] Fix: MdeModulePkg: Implement UEFI25 HII Config keyword handler protocol. X-BeenThere: edk2-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list Reply-To: edk2-devel@lists.sourceforge.net List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.sourceforge.net X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ryan.harkin@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 This patch removes the unused DevicePathSize variable. The following commit introduces the DevicePathSize variable in function GetStringIdFromDatabase: commit 87bfeb11f84dd1d369bb2e195ef83d20b0d80d61 Author: Eric Dong Date: Wed May 13 08:35:29 2015 +0000 MdeModulePkg: Implement UEFI25 HII Config keyword handler protocol. This variable is declared, initialised, conditionally set, but never used. The ARM64 builds reject unused variables as an error, eg: /linaro/working/edk2.git/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c: In function 'EnumerateAllKeywords': /linaro/working/edk2.git/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c:2568:9: error: variable 'DevicePathSize' set but not used [-Werror=unused-but-set-variable] UINTN DevicePathSize; Signed-off-by: Ryan Harkin --- MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c index c3cd064..1756c15 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c @@ -2565,7 +2565,6 @@ EnumerateAllKeywords ( UINT8 *DevicePathPkg; UINT8 *DevicePath; HII_DATABASE_RECORD *DataBaseRecord; - UINTN DevicePathSize; HII_DATABASE_PACKAGE_LIST_INSTANCE *PackageListNode; HII_STRING_PACKAGE_INSTANCE *StringPackage; CHAR8 *LocalNameSpace; @@ -2580,7 +2579,6 @@ EnumerateAllKeywords ( BOOLEAN ReadOnly; DataBaseRecord = NULL; - DevicePathSize = 0; Status = EFI_SUCCESS; MultiKeywordResp = NULL; DevicePath = NULL; @@ -2600,7 +2598,6 @@ EnumerateAllKeywords ( DataBaseRecord = CR (Link, HII_DATABASE_RECORD, DatabaseEntry, HII_DATABASE_RECORD_SIGNATURE); if ((DevicePathPkg = DataBaseRecord->PackageList->DevicePathPkg) != NULL) { DevicePath = DevicePathPkg + sizeof (EFI_HII_PACKAGE_HEADER); - DevicePathSize = GetDevicePathSize ((EFI_DEVICE_PATH_PROTOCOL *) DevicePath); } PackageListNode = DataBaseRecord->PackageList;