From nobody Wed Mar 02 13:59:39 2022 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 D347819EEC49; Wed, 2 Mar 2022 13:59:40 +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 4K7wj80XSrz52dX; Wed, 2 Mar 2022 13:59:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646229580; 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=MVDxZrDsDA3d51zcPmZIr8ZgcAYW9z0bNMUZOIwIouM=; b=OtMaHTx/n9rJpGn2gBHBrNzEqVATq2KgQp1A05OxRa0JFps7cUPRHh20cHf6hvp6p1snZL POdA27z9ZjCjAAFaQ4mASykzypmuv2Bu7B36SqhvYM9NDN29HCG6EkSeAeC9wx8UjM3NJJ 9D4VfaeajtRjeftVZ/StGJpf/ntGJjMs0CoQdT1b/kp3Yr1PZwLxxP/jxiFFc3SIQ1U5cW V0Agq669kmwJEVbB4Mpj+ISnOZu+MYKGF5aCg1Xr56UWeYPhuSzWFv/LXjMlE9BdIM5j4c G2yPYkQPXMx+YYKfxXkZcnpqZX2d1M8vrFVV9d6FQn9tHyzB4mLR6XKBlfsZWA== 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 C9461247D4; Wed, 2 Mar 2022 13:59:39 +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 222DxdlM020562; Wed, 2 Mar 2022 13:59:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 222DxdS6020561; Wed, 2 Mar 2022 13:59:39 GMT (envelope-from git) Date: Wed, 2 Mar 2022 13:59:39 GMT Message-Id: <202203021359.222DxdS6020561@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c9b56f90d6af - stable/13 - fbt: Remove handling for CTFv1 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c9b56f90d6af7b65f4bde2d41fbe25db83227271 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646229580; 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=MVDxZrDsDA3d51zcPmZIr8ZgcAYW9z0bNMUZOIwIouM=; b=C1XWqx0IXIWTEHXsDkuXCn0ppL81upSTR9c77PpThf7T08FP+HWcNk1abmFZjgFJpcuy3V s2Rd+ElPPiIgNoMNlQrpjCC0XPhZpxNKTCl+ine16HD+2qThYAjJILX6heNo0WWuYxhv79 Jl75rZKuGRR2DBJgseC0bgWH6tUB9JIt901SzWS6jlDUOUW87GihsJ+yAST9vxjJgWF93Q gacfHKIodwvEUL5YfBkit0O0SJFjEZF2lKrCgovaeq5WXC4NYWL53x3ITATqfdf4q3kEXX k/kqYqcAnk1ZbTqEYhXe2cvFmFhD6hxwsks7L261UjKq3olw14++euUilrD7WA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646229580; a=rsa-sha256; cv=none; b=ZM1obSo9Bn6tkYlWFLeci2jGsY14hPV7AWjjS7skPLJh+Fsz9MeVHOGeQox4x4ZB8EognQ olI53vdqxT5CmG/EMoaLMtkCTgAQs3HvLNQu/ptayhdwjaczAZSNcSra4TGTpO8cZrPh6z NxK9Hfy2pT7WL6f5rCHN9swcz0C/Ak6Y6Oj83qx7ZM4QuHlA/ZX+4GsiDVLJCK08dUosDM AGzqeUPzF7Xauz3dSb5ZjGNy8XJIV39poIn1eg+a0ovu0sc1Li4LcON66wHg93Mb6twqp8 Phs1toacPBpodd0VPMwtrTCby1IrGQxcwHVhAwzTlBmnAKqvRWfSoV2i7GGQcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c9b56f90d6af7b65f4bde2d41fbe25db83227271 commit c9b56f90d6af7b65f4bde2d41fbe25db83227271 Author: Mark Johnston AuthorDate: 2022-02-23 14:58:35 +0000 Commit: Mark Johnston CommitDate: 2022-03-02 13:59:16 +0000 fbt: Remove handling for CTFv1 Sponsored by: The FreeBSD Foundation (cherry picked from commit 2997ab002e0c3430aff00c8b6f6b0c44c6707bd7) --- sys/cddl/dev/fbt/fbt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/cddl/dev/fbt/fbt.c b/sys/cddl/dev/fbt/fbt.c index 2137075e3831..5b1aeab3bafb 100644 --- a/sys/cddl/dev/fbt/fbt.c +++ b/sys/cddl/dev/fbt/fbt.c @@ -446,8 +446,7 @@ fbt_get_ctt_size(uint8_t version, const ctf_type_t *tp, ssize_t *sizep, { ssize_t size, increment; - if (version > CTF_VERSION_1 && - tp->ctt_size == CTF_LSIZE_SENT) { + if (tp->ctt_size == CTF_LSIZE_SENT) { size = CTF_TYPE_LSIZE(tp); increment = sizeof (ctf_type_t); } else {