From nobody Wed Mar 2 13:59:38 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 0536819EEAEF; Wed, 2 Mar 2022 13:59:39 +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 4K7wj66Vvmz52nW; Wed, 2 Mar 2022 13:59:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646229578; 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=IRPCOYQXn8zTXhlpL+Pm72PU0BGwgn3vvO4I/21mru0=; b=ZEPl3lvwBfDHThOH23axz72xodX2WQ0KMnljn0wTSvXvoRzQ4JXF2aMnOlpPzN0wLbSOFm 4DevHdlZm3YljHtEW+6XFgWPC0b83oFeoUTiCyilRVo6E2uTm/cl7xIVd3DGAtz+YAltSF 4W3tJpImQKoTc0RBPvOffHYjBVSg4/4/MhOZxMuGFj5DuBeDaoU4NBLjm60He2gj5/anDn Gt+kQcOsaJVKWMs3hQ9HpHONc+w/lVcX6jhv94Z7fh+rRudWOaBlNaqC0gdMqzT/eale6J 7pP3iS3aIRrwMuPV4D8kN80tY2hvQD7KQcCyseWwKDdY6jJ/IjbxcmW0U1gYsQ== 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 AFB0D24649; Wed, 2 Mar 2022 13:59:38 +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 222DxcFb020533; Wed, 2 Mar 2022 13:59:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 222DxcEL020532; Wed, 2 Mar 2022 13:59:38 GMT (envelope-from git) Date: Wed, 2 Mar 2022 13:59:38 GMT Message-Id: <202203021359.222DxcEL020532@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: 78fb81dec2f8 - stable/13 - libctf: Remove checks 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: 78fb81dec2f843b8b1732aecf7306a077461fc49 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646229579; 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=IRPCOYQXn8zTXhlpL+Pm72PU0BGwgn3vvO4I/21mru0=; b=aq8yBSXpoECN/a8ZoUxx7TZKh4Y7+fcBWLGOxnDRQm/SkhMgIeVdZ21lOkvltevsUVAi9B ieMPjEG0wFMxPHkbSfeBzr7p/Xp4A2Ob2YY1cvjUINCkJUwYV28EJMnqT/U93DV22ysd89 ccfpHmlBq/HCUvmzQmpq0jMCZ7GjP9EwZX8CDt93MFCtYs3YnQMhqRdYhpEzI1yzFp8EI9 5qVfg2iJEHojrRMUADfmvwrkg4K92HgZYYo269iiG7ygCNplWtOQt8ofSEh+8/3umyN6Q0 veJGiDYawI0mtVvyk4ZkUfp9Tua1GBz7dnKnUT6I1dIZYuYje8ILTfaofzV/fQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646229579; a=rsa-sha256; cv=none; b=Nc8L+BHqdHuVmpRXX9dIKE45rMQ4gJP9og/wnOmeEwlIxtCx4w6YehIiF748YkzrCalntL M+GT+hKCDc2+vo2Ncfyk9N0EAL4r2W7xbGvEj1Bs6x+QncpMwUb/Pew1adxtPIC5jhmDiK sKoe6pt5Si6Vaatp2vOetmMqQukMyoLY9e8CD/61QQOY50nf+cQiatDForXACAA3NEqz44 6eLimE1vaJM22iBou/Vk45OWxUyVR1908Xf6aLNBKGFEfaYE7fPHG8MJ8t4bhXf1CpK9j1 X8gL//sb5MF4eXIqSULUz7ah6IhnYJPCR6o3EzqiRYXFrmban+UdVibWb3KjAA== 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=78fb81dec2f843b8b1732aecf7306a077461fc49 commit 78fb81dec2f843b8b1732aecf7306a077461fc49 Author: Mark Johnston AuthorDate: 2022-02-23 14:57:41 +0000 Commit: Mark Johnston CommitDate: 2022-03-02 13:58:59 +0000 libctf: Remove checks for CTFv1 Per commit 7db423d69273 ("libctf: Rip out CTFv1 support") this support is obsolete. Sponsored by: The FreeBSD Foundation (cherry picked from commit 565518046c9e721ea6ff608d44f1e89d344e5e02) --- cddl/contrib/opensolaris/common/ctf/ctf_open.c | 9 +++------ cddl/contrib/opensolaris/common/ctf/ctf_types.c | 12 +++++------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/cddl/contrib/opensolaris/common/ctf/ctf_open.c b/cddl/contrib/opensolaris/common/ctf/ctf_open.c index d64337a68bff..5ab06890d7f1 100644 --- a/cddl/contrib/opensolaris/common/ctf/ctf_open.c +++ b/cddl/contrib/opensolaris/common/ctf/ctf_open.c @@ -229,8 +229,7 @@ init_types(ctf_file_t *fp, const ctf_header_t *cth) break; case CTF_K_STRUCT: case CTF_K_UNION: - if (fp->ctf_version == CTF_VERSION_1 || - size < CTF_LSTRUCT_THRESH) { + if (size < CTF_LSTRUCT_THRESH) { ctf_member_t *mp = (ctf_member_t *) ((uintptr_t)tp + increment); @@ -383,8 +382,7 @@ init_types(ctf_file_t *fp, const ctf_header_t *cth) if (err != 0 && err != ECTF_STRTAB) return (err); - if (fp->ctf_version == CTF_VERSION_1 || - size < CTF_LSTRUCT_THRESH) + if (size < CTF_LSTRUCT_THRESH) vbytes = sizeof (ctf_member_t) * vlen; else { vbytes = sizeof (ctf_lmember_t) * vlen; @@ -399,8 +397,7 @@ init_types(ctf_file_t *fp, const ctf_header_t *cth) if (err != 0 && err != ECTF_STRTAB) return (err); - if (fp->ctf_version == CTF_VERSION_1 || - size < CTF_LSTRUCT_THRESH) + if (size < CTF_LSTRUCT_THRESH) vbytes = sizeof (ctf_member_t) * vlen; else { vbytes = sizeof (ctf_lmember_t) * vlen; diff --git a/cddl/contrib/opensolaris/common/ctf/ctf_types.c b/cddl/contrib/opensolaris/common/ctf/ctf_types.c index 21b061cd9356..5b6b07655d82 100644 --- a/cddl/contrib/opensolaris/common/ctf/ctf_types.c +++ b/cddl/contrib/opensolaris/common/ctf/ctf_types.c @@ -33,8 +33,7 @@ ctf_get_ctt_size(const ctf_file_t *fp, const ctf_type_t *tp, ssize_t *sizep, { ssize_t size, increment; - if (fp->ctf_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 { @@ -75,7 +74,7 @@ ctf_member_iter(ctf_file_t *fp, ctf_id_t type, ctf_member_f *func, void *arg) if (kind != CTF_K_STRUCT && kind != CTF_K_UNION) return (ctf_set_errno(ofp, ECTF_NOTSOU)); - if (fp->ctf_version == CTF_VERSION_1 || size < CTF_LSTRUCT_THRESH) { + if (size < CTF_LSTRUCT_THRESH) { const ctf_member_t *mp = (const ctf_member_t *) ((uintptr_t)tp + increment); @@ -425,8 +424,7 @@ ctf_type_align(ctf_file_t *fp, ctf_id_t type) if (LCTF_INFO_KIND(fp, tp->ctt_info) == CTF_K_STRUCT) n = MIN(n, 1); /* only use first member for structs */ - if (fp->ctf_version == CTF_VERSION_1 || - size < CTF_LSTRUCT_THRESH) { + if (size < CTF_LSTRUCT_THRESH) { const ctf_member_t *mp = vmp; for (; n != 0; n--, mp++) { ssize_t am = ctf_type_align(fp, mp->ctm_type); @@ -665,7 +663,7 @@ _ctf_member_info(ctf_file_t *fp, ctf_id_t type, const char *name, ulong_t off, if (kind != CTF_K_STRUCT && kind != CTF_K_UNION) return (ctf_set_errno(ofp, ECTF_NOTSOU)); - if (fp->ctf_version == CTF_VERSION_1 || size < CTF_LSTRUCT_THRESH) { + if (size < CTF_LSTRUCT_THRESH) { const ctf_member_t *mp = (const ctf_member_t *) ((uintptr_t)tp + increment); @@ -849,7 +847,7 @@ ctf_type_rvisit(ctf_file_t *fp, ctf_id_t type, ctf_visit_f *func, void *arg, (void) ctf_get_ctt_size(fp, tp, &size, &increment); - if (fp->ctf_version == CTF_VERSION_1 || size < CTF_LSTRUCT_THRESH) { + if (size < CTF_LSTRUCT_THRESH) { const ctf_member_t *mp = (const ctf_member_t *) ((uintptr_t)tp + increment);