From nobody Mon Apr 28 03:45:42 2025 X-Original-To: dev-commits-src-all@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 4Zm8Vb50jBz5tmKv; Mon, 28 Apr 2025 03:45:43 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zm8Vb2Nh4z3pjr; Mon, 28 Apr 2025 03:45:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745811943; 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=DVntLR4eEkdEEz9fYbe55lE0XDo109U1h4pJrGTiw38=; b=CFKFSe8rRTMTBQm9LSTfT3pN8B3Q4o+870ypzqvRkYOb/vgZUgA/05Bsn8NXqbTzfsLJg8 ZaUq8pMQBVgWMXJrwgagjyAj9+JjJn/UJVdLTqmWaMbQD6WQS3lLGLDGL/s1LANQ8FZPly +Sm4Enhv+ezab/c76miHhBk6NbujyutrarKp07rzRhjvMe/IgbvrUqpElJf+w22COjO9zb s/oMIKwP9MjMAQ7tYY0ZWb0esTmw127pqMATlGYocLKwIswCUQoCMYnLaWu2RGgCKsodvm GEUY8i/pagS8r99h0v39lObasEN0o1k1/LpTDLWYCdokyQ/h5JF2vu/63Ccdkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745811943; a=rsa-sha256; cv=none; b=jTWC10EEWiLZD7DNQyvYh6oU7+I9X5/dl99ivb2VU0N7gSF1awGwK1hfgDOT7Pl0SbciGD q+eqneGiI7bfz+Af6GHNaHOFjP95idSnQwJe2wUBVp4phb930hyh2d+BLib2ccMQK9qhUN GYeuPacoFl1X68yiwyb6DV3CAWCSKeHNGqlyS4aZFno/e8j86zyD9q8e3H30154hRqfFrQ 282BbjmmyQYBHlUrYUqPuGFTrN7+Ibic9hhxMuA65/v7TkPduFfQnJBRe/ZpG10xQviQHJ DaPybUVwk3SVbAStiYj7EW1pvu1Egsj6gqSDs4aKFePwUQWgvke10lJ3z0gIdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745811943; 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=DVntLR4eEkdEEz9fYbe55lE0XDo109U1h4pJrGTiw38=; b=xLFtSu+iMSy05fUNF5hSaNjOWI4EEC6g23TQhijkooCRPLI91wMg/qWNbIce3Fm7HTyYL5 QTphOpgKLo0e57NOb+Yfc9/tD4n/83/ueEtbiC1ipG869/OAu/HI33YgpqzK4xYR3Km0dT 1bNyYYbgL3kyBgcU7c/GAY7Fcgc9SWRAewBZq0M69a5Vf6VmAPzruZ3BE/F4xFgZQvvw6X HtdtvMwIbJmUNbXUfz/c7KNXQo4/Nkn5E9cy1m4li/KeqzzFeyQLWDypAqKezIoEjzk4is xV6cGvh5IvQYgDA4JdYjbOSW7dBIFPsgiYQEi8iJj9jfWgd/a7YZs9MUO6bRMA== 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 4Zm8Vb0Z9wz3D3; Mon, 28 Apr 2025 03:45:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53S3jgPK052812; Mon, 28 Apr 2025 03:45:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53S3jgYD052809; Mon, 28 Apr 2025 03:45:42 GMT (envelope-from git) Date: Mon, 28 Apr 2025 03:45:42 GMT Message-Id: <202504280345.53S3jgYD052809@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 8ec2792258bd - stable/14 - loader: remove unneeded variable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 8ec2792258bdab415a4fde4d118c88bf8477a907 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8ec2792258bdab415a4fde4d118c88bf8477a907 commit 8ec2792258bdab415a4fde4d118c88bf8477a907 Author: Ahmad Khalifa AuthorDate: 2024-08-12 10:01:07 +0000 Commit: Warner Losh CommitDate: 2025-04-28 03:43:31 +0000 loader: remove unneeded variable Reviewed by: imp, kib Pull Request: https://github.com/freebsd/freebsd-src/pull/1381 (cherry picked from commit a698c15a41afca19f87e11d4f8ce5664f992673b) --- stand/efi/loader/copy.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/stand/efi/loader/copy.c b/stand/efi/loader/copy.c index e5c950d75f37..3e466e875af8 100644 --- a/stand/efi/loader/copy.c +++ b/stand/efi/loader/copy.c @@ -220,11 +220,10 @@ command_copy_staging(int argc, char *argv[]) [COPY_STAGING_DISABLE] = "disable", [COPY_STAGING_AUTO] = "auto", }; - int prev, res; + int prev; - res = CMD_OK; if (argc > 2) { - res = CMD_ERROR; + return (CMD_ERROR); } else if (argc == 2) { prev = copy_staging; if (strcmp(argv[1], "enable") == 0) @@ -235,9 +234,9 @@ command_copy_staging(int argc, char *argv[]) copy_staging = COPY_STAGING_AUTO; else { printf("usage: copy_staging enable|disable|auto\n"); - res = CMD_ERROR; + return (CMD_ERROR); } - if (res == CMD_OK && prev != copy_staging) { + if (prev != copy_staging) { printf("changed copy_staging, unloading kernel\n"); unload(); efi_copy_free(); @@ -246,7 +245,7 @@ command_copy_staging(int argc, char *argv[]) } else { printf("copy staging: %s\n", mode[copy_staging]); } - return (res); + return (CMD_OK); } COMMAND_SET(copy_staging, "copy_staging", "copy staging", command_copy_staging); #endif @@ -256,18 +255,16 @@ command_staging_slop(int argc, char *argv[]) { char *endp; u_long new, prev; - int res; - res = CMD_OK; if (argc > 2) { - res = CMD_ERROR; + return (CMD_ERROR); } else if (argc == 2) { new = strtoul(argv[1], &endp, 0); if (*endp != '\0') { printf("invalid slop value\n"); - res = CMD_ERROR; + return (CMD_ERROR); } - if (res == CMD_OK && staging_slop != new) { + if (staging_slop != new) { staging_slop = new; printf("changed slop, unloading kernel\n"); @@ -278,7 +275,7 @@ command_staging_slop(int argc, char *argv[]) } else { printf("staging slop %#lx\n", staging_slop); } - return (res); + return (CMD_OK); } COMMAND_SET(staging_slop, "staging_slop", "set staging slop", command_staging_slop);