From patchwork Tue Dec 5 15:47:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 120702 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5906776qgn; Tue, 5 Dec 2017 07:48:03 -0800 (PST) X-Google-Smtp-Source: AGs4zMY4VpX+UHXFKlFdkRhaTYc3dd3RuQNeAAqo72tT6z/wLht/GewrNFxsef7hCBza2n4wnj2B X-Received: by 10.99.111.140 with SMTP id k134mr12990873pgc.274.1512488883086; Tue, 05 Dec 2017 07:48:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512488883; cv=none; d=google.com; s=arc-20160816; b=BqipQI+VsREUltL9NLCVshuHq4DR/qK18MO3HBOt5FvKQlP7LAtOb8SPPmPSHqsOwI TX7vOON9hrPE269F0oFN1rPnviNBJCoEeHZ6C9Tleq70T/hRr3uD4qIL7BaLP4qHojRX a3gJbex+PjaRdBe8UHuUxrWgvy/4qika4CLYKqM0kh5vCcwuFV/7skcyn8Ept3/O8iGr q19ulAcaHlT++ELGqXagQqkXqcEj8jDQl+wjbNcBj8DhdydDlvXQCpPokGcgUVxJMLeh hMgUyqWvfkKYBllPp9/SXuWJnadC7NlHPenNSkNRsBJYSMmqpvWvpAO8BwCNjpEnlvLg G3+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=a+LaBzJIQnwK/t8/HJs65NBDPLuhcAoLkmEf5sEjvU0=; b=hj3nmDe2nT2/i9mxt8Q8YgolEvZTwdfNhUpod6a3/pfB7CW+XDAC6K2gdN9eFMdqnB M2NTXK6NRUNxN15/IS1oAaJrL+jYHQxp5mQTmHRc3mcavh3V9tFmBDLWFjoTnB2kxnfI vBDYP+HvOdrGziw73C8SnXlDTeQpHtM76djPv7Q7awQQ2KBhTRdwdTHpYqPb5quQwBCv d8unobnjw0uoPiE+2z6ni2Vkk9JU6M3acO0FO6Y1FJfc4zt8f/wYla6chKtfHBMW14wd ZFaTgv9PbToqTvNvIYHc+GOebaJ61J55GFWRY0cPa5Pf7UBVPwaYWg3xJOnrTRkMWoO0 f6Qg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=fCIcnqIy; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id e9si258915pli.126.2017.12.05.07.48.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Dec 2017 07:48:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=fCIcnqIy; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 365032034A763; Tue, 5 Dec 2017 07:43:31 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::241; helo=mail-wr0-x241.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x241.google.com (mail-wr0-x241.google.com [IPv6:2a00:1450:400c:c0c::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id E9D5A20356240 for ; Tue, 5 Dec 2017 07:43:29 -0800 (PST) Received: by mail-wr0-x241.google.com with SMTP id q9so783300wre.7 for ; Tue, 05 Dec 2017 07:48:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=GX6MgJCWRSQFgtfR9Hpph67SbmkN/xp6TU3jMaJxqLw=; b=fCIcnqIyu7swVSeI8aIh2itHYf+wlLj7lV1+id6CYGiFMgQ480XPkrUDGoDHMVfQWE mj0lN8rxd/sNnRVBzUiuvFXM5vQ2x0fj6wS57AlX0xan9CksYwQStOTixhg7f7hWFvzx D2VkE7RmQZb/DdWCiVV4BBzngpg+m+TPhcYwc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=GX6MgJCWRSQFgtfR9Hpph67SbmkN/xp6TU3jMaJxqLw=; b=VFPIwQu7Kw3EbEoHMfE3xDphveJiTXMgrs2h9lFBYVPv1eQ97L7eAAZ+IDSd5u/GHb UysI1KZnqfBX5x3snDHirCQgq+VprQjtOzJW9W6NBEJWVx51pSJrDsO9umnvJlZ5tXeC Kj3TB1thYz5dujC5ZIO5U9yc5CSx6LyJ170VZMMTtj0tYbEmDSiQwGyB84gM631Y6dC7 Yer9dmHVldSYsxwCh+KN5S1Vz2FCiu0OS3euaKlPiZB00GcvlLB/VyZWUoX0bN15TltZ 1FxKaZG9BENl2gzBLuOSl1DyUcSiZH9YKgXGb6c2XuOmqwD3Kv8+S4c7y3HbKU0hkr3m oJ4A== X-Gm-Message-State: AJaThX7TGKpic6q7xlqlwua3eh8xuwP2en2qUxAgSxYLfNc8u/EqN4o5 QcbaUugaaE9mx8muKdTl9TfINc1cK5g= X-Received: by 10.223.147.133 with SMTP id 5mr16275861wrp.230.1512488878777; Tue, 05 Dec 2017 07:47:58 -0800 (PST) Received: from vanye.hemma.eciton.net (cpc92316-cmbg19-2-0-cust118.5-4.cable.virginm.net. [82.12.0.119]) by smtp.gmail.com with ESMTPSA id k11sm842459wmi.18.2017.12.05.07.47.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Dec 2017 07:47:57 -0800 (PST) From: Leif Lindholm To: edk2-devel@lists.01.org Date: Tue, 5 Dec 2017 15:47:56 +0000 Message-Id: <20171205154756.12302-1-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.11.0 Subject: [edk2] [PATCH] BaseTools: align ENCODE_ERROR macro with MdePkg version X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Liming Gao MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" BaseTools' BaseTypes.h defined the ENCODE_ERROR macro as whereas MdePkg defines it as When building with GCC 6.3 (at least) the former triggers "error: overflow in implicit constant conversion [-Werror=overflow]" Resolve this by aligning it with the latter one. This also requires aligning the BaseTools typedef of RETURN_STATUS with the MdePkg one: INTN -> UINTN. Add an explicit initialization of *Alignment to 0 in GenFfs.c GetAlignmentFromFile to get rid of a warning occuring with GCC after this change (-Werror=maybe-uninitialized). Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Leif Lindholm --- BaseTools/Source/C/GenFfs/GenFfs.c | 1 + BaseTools/Source/C/Include/Common/BaseTypes.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/BaseTools/Source/C/GenFfs/GenFfs.c b/BaseTools/Source/C/GenFfs/GenFfs.c index e2fb3e0d1e..3b4a9b7761 100644 --- a/BaseTools/Source/C/GenFfs/GenFfs.c +++ b/BaseTools/Source/C/GenFfs/GenFfs.c @@ -529,6 +529,7 @@ GetAlignmentFromFile(char *InFile, UINT32 *Alignment) InFileHandle = NULL; PeFileBuffer = NULL; + *Alignment = 0; memset (&ImageContext, 0, sizeof (ImageContext)); diff --git a/BaseTools/Source/C/Include/Common/BaseTypes.h b/BaseTools/Source/C/Include/Common/BaseTypes.h index 198647ab95..5fa4e560d8 100644 --- a/BaseTools/Source/C/Include/Common/BaseTypes.h +++ b/BaseTools/Source/C/Include/Common/BaseTypes.h @@ -170,12 +170,12 @@ // EFI Error Codes common to all execution phases // -typedef INTN RETURN_STATUS; +typedef UINTN RETURN_STATUS; /// /// Set the upper bit to indicate EFI Error. /// -#define ENCODE_ERROR(a) (MAX_BIT | (a)) +#define ENCODE_ERROR(a) ((RETURN_STATUS)(MAX_BIT | (a))) #define ENCODE_WARNING(a) (a) #define RETURN_ERROR(a) ((a) < 0)