From nobody Thu Dec 16 03:04:26 2021 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 917BE18D8DF5; Thu, 16 Dec 2021 03:04:27 +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 4JDxmB3bv0z4XFt; Thu, 16 Dec 2021 03:04:26 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 38131285C2; Thu, 16 Dec 2021 03:04:26 +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 1BG34QF1055931; Thu, 16 Dec 2021 03:04:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BG34Qtq055930; Thu, 16 Dec 2021 03:04:26 GMT (envelope-from git) Date: Thu, 16 Dec 2021 03:04:26 GMT Message-Id: <202112160304.1BG34Qtq055930@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: f037731345f1 - main - stand/module: skip is only used by veriexec 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: f037731345f1f4d2b09bb91648c6b4ea8638a65f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639623866; 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=LB1tPNNFjiEmVYdb2AWdEpz/HK8oWjGC4k3ebmH5eFk=; b=DTJTr/ZRfR8XIIW+BXlhQ5tvVbS9SrDUTm/mcxe1CrrlYWHARdzrfUAZ3111YEWsTHRBCn 7oJn71Ldg8+jBCAbmC5+1oi0fv/RjEjgIakcf9Wu1P++OxOr1VjqEPO15n714kwhgni10Z J92GghYz/+Cu0nNdIItc2q3onrvp3uR6eu6HAZIScmV8ffK2W3dSwaTwB/BTcZ6S6hZPNZ YDqHtbm+9YCNYZ+pI/x7bFUDMNs7TyzT7sTgANx8SiTa3+1TKM2sY7MK1Ld9Bxun2IUHHa pkzSIF09jcZikvhl4BwlVATzMobd0rdkdzmaiHdlTmmvFTRJpLoHw0gArKns8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639623866; a=rsa-sha256; cv=none; b=EXgTocucuusf3zzdZp4QbWSUj45GrJx0pVU07Meo0nffuY7xbS+icD5DmJNgJWzegTuKdd Medwzf+bJ6uURrwr6n4y5M1UA9Zs3R/4mefgmHgPYousS/0CFrv/AcbNUmo9XogYCa9+Zg xkwp60kHRWa331ktllJzBzIWKVkSTGS2+Ck18VbqSi4xgNBzYRjj+HjZ04wsY7t7VZYGZh Bm7HcxiYJwA1DGXNSXgnpu8oJtUV8XQVgIFajUfAvorV3jK2bNpxm2eOhD3v2oz5l24xsA DL0AvdXBLjqCY26ZGRMoXuFIm+36WAoo8Fnnp9IrwfCNoBPK8KHwoNeOYJEqWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f037731345f1f4d2b09bb91648c6b4ea8638a65f commit f037731345f1f4d2b09bb91648c6b4ea8638a65f Author: Warner Losh AuthorDate: 2021-12-16 02:52:29 +0000 Commit: Warner Losh CommitDate: 2021-12-16 02:58:33 +0000 stand/module: skip is only used by veriexec Sponsored by: Netflix --- 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 b9ddd868b8de..9cb10d0f9f9d 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;