From patchwork Fri Aug 4 15:27:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicola Vetrini X-Patchwork-Id: 13342040 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3BD63C001DF for ; Fri, 4 Aug 2023 15:28:33 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.577191.904155 (Exim 4.92) (envelope-from ) id 1qRwis-0008Aw-Bc; Fri, 04 Aug 2023 15:28:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 577191.904155; Fri, 04 Aug 2023 15:28:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qRwis-00089g-3f; Fri, 04 Aug 2023 15:28:14 +0000 Received: by outflank-mailman (input) for mailman id 577191; Fri, 04 Aug 2023 15:28:12 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qRwiq-00080a-Pm for xen-devel@lists.xenproject.org; Fri, 04 Aug 2023 15:28:12 +0000 Received: from support.bugseng.com (mail.bugseng.com [162.55.131.47]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8517a4f9-32db-11ee-b26d-6b7b168915f2; Fri, 04 Aug 2023 17:28:11 +0200 (CEST) Received: from nico.bugseng.com (unknown [147.123.100.131]) by support.bugseng.com (Postfix) with ESMTPSA id C39364EE0741; Fri, 4 Aug 2023 17:28:09 +0200 (CEST) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 8517a4f9-32db-11ee-b26d-6b7b168915f2 From: Nicola Vetrini To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, michal.orzel@amd.com, xenia.ragiadakou@amd.com, ayan.kumar.halder@amd.com, consulting@bugseng.com, Nicola Vetrini , Andrew Cooper , George Dunlap , Jan Beulich , Julien Grall , Wei Liu Subject: [XEN PATCH 2/6] libelf: address MISRA C:2012 Rule 5.3 Date: Fri, 4 Aug 2023 17:27:45 +0200 Message-Id: <55624244c42297da7da954009ba0559c47fc245e.1691162261.git.nicola.vetrini@bugseng.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 The types u{8,16,32,64} defined in 'xen/arch/x86/include/asm/types.h' shadow the variables in the modified function, hence violating Rule 5.3. Therefore, the rename takes care of the shadowing. No functional changes. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini --- xen/common/libelf/libelf-tools.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/xen/common/libelf/libelf-tools.c b/xen/common/libelf/libelf-tools.c index a9edb6a8dc..f0d5da1abf 100644 --- a/xen/common/libelf/libelf-tools.c +++ b/xen/common/libelf/libelf-tools.c @@ -91,10 +91,10 @@ uint64_t elf_access_unsigned(struct elf_binary * elf, elf_ptrval base, { elf_ptrval ptrval = base + moreoffset; bool need_swap = elf_swap(elf); - const uint8_t *u8; - const uint16_t *u16; - const uint32_t *u32; - const uint64_t *u64; + const uint8_t *uint8; + const uint16_t *uint16; + const uint32_t *uint32; + const uint64_t *uint64; if ( !elf_access_ok(elf, ptrval, size) ) return 0; @@ -102,17 +102,17 @@ uint64_t elf_access_unsigned(struct elf_binary * elf, elf_ptrval base, switch ( size ) { case 1: - u8 = (const void*)ptrval; - return *u8; + uint8 = (const void*)ptrval; + return *uint8; case 2: - u16 = (const void*)ptrval; - return need_swap ? bswap_16(*u16) : *u16; + uint16 = (const void*)ptrval; + return need_swap ? bswap_16(*uint16) : *uint16; case 4: - u32 = (const void*)ptrval; - return need_swap ? bswap_32(*u32) : *u32; + uint32 = (const void*)ptrval; + return need_swap ? bswap_32(*uint32) : *uint32; case 8: - u64 = (const void*)ptrval; - return need_swap ? bswap_64(*u64) : *u64; + uint64 = (const void*)ptrval; + return need_swap ? bswap_64(*uint64) : *uint64; default: return 0; }