From patchwork Thu Aug 21 15:35:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 102 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755790556; bh=bXCKVnnqyv0Q7jZxV+20uy1MWdJEJODIgzptNRNz2uo=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=RbxfJpTA3b7km6TmPP3yhaHjsu6u0XWF5FYd76f/qObk0MDUqE+Ys8xnxuODid5g8 axPpqMew85gyvNPqHxx9ufUpOHzXMQj/9SVTzdDPtBVfNFqB8esaIL18ksJcTSpJcG v2XOAJn9UrOn/j3cuqGhCUWDo2aWxfLwQW+Tg+BuPvhqG5k02WiDS3anoQc8vEMPHI N/K35JRk8gUHVPmWBFdfr3WDM11Lvdxqjttbp8LRt2UwAwUBTpKycQuETd5Sigh/Qz 51KatW0K0XgC3HcIJgLQ0HtantuabN6xxsy58yKZO5U74cy6VizD/J37Y+SzSN86Av atB1H1KAycZIw== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id EC6A3676EF for ; Thu, 21 Aug 2025 09:35:56 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id cW3ZJ7f588wM for ; Thu, 21 Aug 2025 09:35:56 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755790556; bh=bXCKVnnqyv0Q7jZxV+20uy1MWdJEJODIgzptNRNz2uo=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=RbxfJpTA3b7km6TmPP3yhaHjsu6u0XWF5FYd76f/qObk0MDUqE+Ys8xnxuODid5g8 axPpqMew85gyvNPqHxx9ufUpOHzXMQj/9SVTzdDPtBVfNFqB8esaIL18ksJcTSpJcG v2XOAJn9UrOn/j3cuqGhCUWDo2aWxfLwQW+Tg+BuPvhqG5k02WiDS3anoQc8vEMPHI N/K35JRk8gUHVPmWBFdfr3WDM11Lvdxqjttbp8LRt2UwAwUBTpKycQuETd5Sigh/Qz 51KatW0K0XgC3HcIJgLQ0HtantuabN6xxsy58yKZO5U74cy6VizD/J37Y+SzSN86Av atB1H1KAycZIw== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 4289D676DF for ; Thu, 21 Aug 2025 09:35:56 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755790554; bh=46kTiSMqTosgVSS3CuLIrzDCz4Q6T2q9CZlMfVLNES4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c2+xANv6PeEwRaMn4eHCb1AiuwTm6XGdB+0lA5E2cT9leAzj0TJSxoLvl5PhUz+iR +zAjkNUMmB1bw1kUOkX7lITde7C5+1s/t0mVHjyw6FVIABkb0ZTICGjp8gl6ybmr4E mrjF871AHo+a0Z4aZAH2Fw6+8SSPHAn2Ffh3d8P6OhR+4yZcWeIeuHKAOj9FyiKaKk MDT1BE51/41ZW77186CaZKmFD6KL3L6eh7EyDls2LNLKlAfNbitaGq0WiNPIiyJ8qT cFvzpU2KuudRz47Lp5nZddQl19hmuDPlOiqCCp8sic85ttXVg74r4uBy9LBqfneowe sVPxwiOk+K7Og== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 287AB676E9; Thu, 21 Aug 2025 09:35:54 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id LdXFc9tTWh2E; Thu, 21 Aug 2025 09:35:54 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1755790552; bh=PvJ+Lex+NhKNGbv+HciK9SIe4DzyJqSIvysykmkcGvA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ABeJuXFzeYbWWpaR2BZIbzzOJTFCaenHJxs/daov7Toz4wZ0UUyhFu1KzSHU10uX8 JMcb7frFpAtmN8KdnECGRBVBy7pp95+VtxT5keEsUoDcZWgfNTACNZ5QpE/B/jpM+E 2158PiepB/l+MpDDGt5dssa/S5A2zGuCE6vAlsaxiq7N42V2gUmiL2kdyv5NCzCRlf KDmg8s3afhzqmJaGtBS3CxjMFL7kftx9eAf03Ry5YF/PBRtkgNMgBOh9CGVdmlWDX7 noXma81KM0Xiwu9h+MchdfVLEZlDmgnL7iODrAS+1AzTrG2x/EvMSG2gyzyjoUMDsQ Fdu8Nu+pdHp0w== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 3416C676DB; Thu, 21 Aug 2025 09:35:52 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Thu, 21 Aug 2025 09:35:21 -0600 Message-ID: <20250821153528.141740-5-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250821153528.141740-1-sjg@u-boot.org> References: <20250821153528.141740-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: OZL263WTJW3CYBDC4ENEZVOUS3D4YGLU X-Message-ID-Hash: OZL263WTJW3CYBDC4ENEZVOUS3D4YGLU X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Heinrich Schuchardt , Simon Glass X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 4/7] efi: Rename var_name64 to name in efi_dump_var_all() List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass This variable name is quite long. There is only one 'name' (the variable name) and it has to be u16 as it is an EFI variable. So rename it to 'name'. Signed-off-by: Simon Glass --- cmd/nvedit_efi.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/cmd/nvedit_efi.c b/cmd/nvedit_efi.c index 12c98a5d5c4..0e4abf49fc0 100644 --- a/cmd/nvedit_efi.c +++ b/cmd/nvedit_efi.c @@ -146,48 +146,47 @@ out: static int efi_dump_var_all(int argc, char *const argv[], const efi_guid_t *guid_p, bool verbose, bool nodump) { - u16 *var_name16, *p; efi_uintn_t buf_size, size; efi_guid_t guid; efi_status_t ret; bool match = false; + u16 *name, *p; buf_size = 128; - var_name16 = malloc(buf_size); - if (!var_name16) + name = malloc(buf_size); + if (!name) return CMD_RET_FAILURE; - var_name16[0] = 0; + name[0] = 0; for (;;) { size = buf_size; - ret = efi_get_next_variable_name_int(&size, var_name16, - &guid); + ret = efi_get_next_variable_name_int(&size, name, &guid); if (ret == EFI_NOT_FOUND) break; if (ret == EFI_BUFFER_TOO_SMALL) { buf_size = size; - p = realloc(var_name16, buf_size); + p = realloc(name, buf_size); if (!p) { - free(var_name16); + free(name); return CMD_RET_FAILURE; } - var_name16 = p; - ret = efi_get_next_variable_name_int(&size, var_name16, + name = p; + ret = efi_get_next_variable_name_int(&size, name, &guid); } if (ret != EFI_SUCCESS) { - free(var_name16); + free(name); return CMD_RET_FAILURE; } if (guid_p && guidcmp(guid_p, &guid)) continue; - if (!argc || match_name(argc, argv, var_name16)) { + if (!argc || match_name(argc, argv, name)) { match = true; - efi_dump_single_var(var_name16, &guid, verbose, nodump); + efi_dump_single_var(name, &guid, verbose, nodump); } } - free(var_name16); + free(name); if (!match && argc == 1) { printf("Error: \"%s\" not defined\n", argv[0]);