Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 2 Mar 2022 13:59:39 GMT
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: c9b56f90d6af - stable/13 - fbt: Remove handling for CTFv1
Message-ID:  <202203021359.222DxdS6020561@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=c9b56f90d6af7b65f4bde2d41fbe25db83227271

commit c9b56f90d6af7b65f4bde2d41fbe25db83227271
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2022-02-23 14:58:35 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
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 {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203021359.222DxdS6020561>