From nobody Mon Jun 26 23:01:51 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qqjyl2zPHz4jtXp; Mon, 26 Jun 2023 23:01:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qqjyl2YYMz3hh3; Mon, 26 Jun 2023 23:01:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687820511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qcNIDSSeX4IWhG57ERkKZOq/b6AUnFnkH5fGKpTRbdQ=; b=S13fcHb8vvJUAxjGvYiM2S4NYa4IrbVq04gWYYoiABoPhyxjCrPvSAuvVM5cQCdNB4V1OD tksnU3bWia+QxAusYKRWq/oeqkYj+ELJehKzbZjXcAWwbt6NFpmt1bujxsVlJuwH15o3/a hB1A6v98atpxqpcwQhbR15jChY75nEJ40OHy2IZSFk5SkoQv5fB3jCHptoRlVBeY2sw145 oH5V6IS1Qo9HRRuOvDRfByfdWlyGdwBToySHZO1bZOMLJzCaZj9V1drsntcoPh+2m9uijU t2zHUbEHz0PmYcGhhOWKhhgmReQTrl48q0ZwbgTG+UwmI9GamiwFQo8wzUzh3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687820511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qcNIDSSeX4IWhG57ERkKZOq/b6AUnFnkH5fGKpTRbdQ=; b=M9cAw6R5F1FTN8+9Arbf2yDXw/UTKADRVpsutAbvLjxjP5lFUa5ioA92VDzWvYLNnfC1sN E0lXcpl+gLHSe8fVhkDq30iyaHqrIZ4Osk3kQzaqmhtQmTqc8/MB9syVb7FwLikfZKct93 bh++UeTXEp+y74NFtLwJ/tPisEEgXQx9eMZdmF3qbhYzBZEjrB24JxUas5yD8uJ8+pwWIg Vv/gaJBQ0258/n6hFl07XkeIaHJ+foZdbvmvoypk2BQ7Rcbpb/aI8+MTBYS8lX0tBGiOd0 YrbyakFUOliKrXSHMa6wkwU+BAGRrdKyCE0E8reYWlDzN8P0D8zVjS9MN94ysg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687820511; a=rsa-sha256; cv=none; b=kvXlOokRZ290qTotLCrd9ud2a4+1k9nr4syMfOXnjkvaunHw3+JxQ25dJYqWlGqm6hoZlO bDfl7sNvuaBE04cwYZiuRQyGcYpep7/X6N1cQ21DKaKj51QjcrOnvvUYVKnW36V3KQFat1 hyLMKs+Mw/QGR6hS4wklNRkIBx/OSvu2L2mzil/F2sr43w4ithJ0TPWR4SVAuoENDaeQ5k 5+DOL8NZjdcAfuWbF55+hCHmjip6NI7vNbvsBykeISQOP1awKhMy3TTJ6Q2pv5qavawWht SCRR7bw9ZYYtG+9zbsheIQkxNBZ2j5bOEoaw8d8dg1aypkNmUZIi0c4fh5z4VA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Qqjyl1g3fzSqG; Mon, 26 Jun 2023 23:01:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35QN1pMV081997; Mon, 26 Jun 2023 23:01:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35QN1pjw081996; Mon, 26 Jun 2023 23:01:51 GMT (envelope-from git) Date: Mon, 26 Jun 2023 23:01:51 GMT Message-Id: <202306262301.35QN1pjw081996@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 780332f1c1cf - main - loader.efi: Remove redundant error message List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 780332f1c1cfc38cf44daf29f39516be75d2f979 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=780332f1c1cfc38cf44daf29f39516be75d2f979 commit 780332f1c1cfc38cf44daf29f39516be75d2f979 Author: VexedUXR AuthorDate: 2023-06-26 22:57:28 +0000 Commit: Warner Losh CommitDate: 2023-06-26 22:57:31 +0000 loader.efi: Remove redundant error message efi_copy_init already prints an error message (with more information) if it fails. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/777 --- stand/efi/loader/main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 872f78ba82b2..5e6a10adb98b 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -1062,10 +1062,8 @@ main(int argc, CHAR16 *argv[]) */ boot_howto_to_env(howto); - if (efi_copy_init()) { - printf("failed to allocate staging area\n"); + if (efi_copy_init()) return (EFI_BUFFER_TOO_SMALL); - } if ((s = getenv("fail_timeout")) != NULL) fail_timeout = strtol(s, NULL, 10);