From nobody Tue Jan 24 22:10:10 2023 X-Original-To: dev-commits-src-branches@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 4P1h3k5mv9z3bdp4; Tue, 24 Jan 2023 22:10:10 +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 4P1h3k4gffz4Htk; Tue, 24 Jan 2023 22:10:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598210; 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=03b+Lw0WFjF0jnK54Wotoeik3kjyGVejDRillOsHJbw=; b=FSwksFz0khTS9cgpNk+Q6T2k7RPV6jn/CG6LsSG2Pi2xHn3zA8QfXPQwJz8ojOcLSv/a4q pW0r1jOcSgf1aNy/QVakbbUJIj9C2pdeJ3yJOILEWgdLZ4sH5zOGVfZACaa6HT36+9ecSd QfHGUQ9oar8FpyU8PkRahFqo81C6w7spMQ5xod6up6e8HGRSUBDpU1s+lf+zVzBaUVnONR QjbX08xQGvKV4O3ch3onDJp7C0uFl/q9eF/DgjVACW8nSaj6hheDL0l8j38Y20w1bmTL4D XZjWAhr6PWuPxbp4NFZNBRG9WRr0UoJTDOn1i7VKJjHzZHaRmGZGXBANzT4z8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598210; 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=03b+Lw0WFjF0jnK54Wotoeik3kjyGVejDRillOsHJbw=; b=wTJC1/MpR+NI8IolzMlKUzL8A16G05J/X5wf6tFBcYF8/TxsMFcGWr0nLTmWlsZAGaQ2M7 sohZoqIJ/7/cwCo4D9IOZGwRBk2J9UfJxAjW0iCDjHVZKogxbXFbjFuEAhXvRQjuE3e7Bq Y5M4vi/4euuIZwADKQM0sRwoQw66+ADb4fvMNHGCW4tKCMcip1+/ddQJwTF+li5jRg7yRH mON8q09Jhi2JdqAvfqq7OCtnJHNfVQjSe7oKDJIY2sqzHsEGG23He14uPyzuuW47YSwdWP Y/1YKQ0ZO72L2peV1dPtuSMJcTyAvbF8wHOmmZQlICWsLbxq4zw/KIxgv43A3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598210; a=rsa-sha256; cv=none; b=Ct9waiRUx13/y6s482BUBFQhh97FniP/tbD28STZo5nyxJVakR9ksFX18Ky28eUK/JVgrn h0LmL/Gb7X0LwXrUia4biKcvw3ApEMbCB6k8Zi+sW0d+gXUiErlA6TD89DQnKexOmvOG6l qG13EyFutL0Okv1szjeI5iexl/o9adAOvfJzlNq+KmVTZuC0nGUi6yCce8/lzYdPUV4efE OpoH7xdb7H9GUcajfwuYCMdgqsMAbMreQgZXQrIACe8wX8FqY0vHtQSOZ94/1eZaTRyjD0 l5+fU3VG5rWp3yFKcyQiqNA3DYlZtoBoKDqkMibRSNpBXS61a4vmzn5fc7S+RA== 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 4P1h3k3XXYzQFD; Tue, 24 Jan 2023 22:10:10 +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 30OMAAeI075711; Tue, 24 Jan 2023 22:10:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMAAYB075702; Tue, 24 Jan 2023 22:10:10 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:10:10 GMT Message-Id: <202301242210.30OMAAYB075702@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: af09db250b09 - stable/13 - stand/module: skip is only used by veriexec List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: af09db250b09684b0e8fae09f9f702a3b5688b76 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=af09db250b09684b0e8fae09f9f702a3b5688b76 commit af09db250b09684b0e8fae09f9f702a3b5688b76 Author: Warner Losh AuthorDate: 2021-12-16 02:52:29 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:19 +0000 stand/module: skip is only used by veriexec Sponsored by: Netflix (cherry picked from commit f037731345f1f4d2b09bb91648c6b4ea8638a65f) --- stand/common/module.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/stand/common/module.c b/stand/common/module.c index 29864932bb9d..bf95fbc59ea3 100644 --- a/stand/common/module.c +++ b/stand/common/module.c @@ -113,9 +113,8 @@ command_load(int argc, char *argv[]) struct preloaded_file *fp; char *typestr; #ifdef LOADER_VERIEXEC - char *prefix; + char *prefix, *skip; #endif - char *skip; int dflag, dofile, dokld, ch, error; dflag = dokld = dofile = 0; @@ -128,8 +127,8 @@ command_load(int argc, char *argv[]) } #ifdef LOADER_VERIEXEC prefix = NULL; -#endif skip = NULL; +#endif while ((ch = getopt(argc, argv, "dkp:s:t:")) != -1) { switch(ch) { case 'd': @@ -142,10 +141,10 @@ command_load(int argc, char *argv[]) case 'p': prefix = optarg; break; -#endif case 's': skip = optarg; break; +#endif case 't': typestr = optarg; dofile = 1;