From nobody Mon Feb 21 14:58:10 2022 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 42E8819CB66A; Mon, 21 Feb 2022 14:58:11 +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 4K2QQp5Yfgz3vQx; Mon, 21 Feb 2022 14:58:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645455491; 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=jJFi7a4kG1gEsUVPgnLNPz+tyYSXBVhNS+m5sme4j/U=; b=CIMDNQLJTqODEUtdZ19JDIzkvCsi47IU/y8N4dqWjr5hZ8Bb6zPYzydYUeBA7oRGo1AzX3 qo8JKwyd2eAWEoBE5WBH3/1yDzj8CkeYhkYkjwUMnwLr+Adsc3o7UzY+3YgE1aqtc2qRhI DVM10Uv9tUMOfmX+ucW5iww6HQ6g/VtflKDskWAk74lf7KrSMfNfi/aeItgpk1/DQvaEM0 0mQYywT2fBt6qBiNaDNZ1ZS9PqcMx4Ir6bMlhMCAV5jHSyJio+OR7jkvO51GvALDosAWs3 /UpN7GmyQT211qj6Sj/yzB394yOtDrNO6U1Zeva2wAVqZMPt1LfZFtOHm0LAlA== 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 7CC3011FFB; Mon, 21 Feb 2022 14:58: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 21LEwAvk086184; Mon, 21 Feb 2022 14:58:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21LEwAGD086183; Mon, 21 Feb 2022 14:58:10 GMT (envelope-from git) Date: Mon, 21 Feb 2022 14:58:10 GMT Message-Id: <202202211458.21LEwAGD086183@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: 5d526e9361fe - stable/13 - libctf: Rip out CTFv1 support 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5d526e9361fed45d5c875407acb6293c17cbd1b3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645455491; 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=jJFi7a4kG1gEsUVPgnLNPz+tyYSXBVhNS+m5sme4j/U=; b=CI2M9t06rTon7WmIJyIc+N6Ac56kv7QzJPbkLMMxikWJNxV2vhChpM9lGQXD2iB0pOk3L9 4YETBTQ3RYKMChYAdg3Ocegck3JO7XpyMtPSSyogWMrCfATxTWYyz2YNQ+xUak3JBzIq47 jJ9bBHY6Mn7cHNqJOsYkKBeTuY7pqWxT3pyZ64/wqtmvWXTVEvdSnCq6KNlTZXnKGV6s5l XTZreZTpRSwa41GXk0MwY62/s72AG4XmewMqzz9r0A155DGh1QZZpGbjG+AOTLMkgKGoB7 nzlKTINGQqQSMa4ntAjPdducpzQCInY7r8xptVaT62QfyRc0wJwWMlQqu2HXlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645455491; a=rsa-sha256; cv=none; b=acmIDNmDdGGUv+JCKVPwGH8StoK+WO9uG+qfHGSl3IbAt9+2gUX2k6f+5XJum+MCWQR2VC J0WWOcqP9p2EUhPUzWxwdGjjWWYG2EQd85CUaAWdXUuMGNgo4Ibs197wILfBwJWUqxnuyj PEUUw19/rFDq/2Y/Xpsm7i8Mmu6ltEycftktB+sfAQCsLXQHUnVkbZ3FnUAcQsloLg3BKK Al+IOJF6dVdmtKcM03Fwt5Rr4HsA1m4pH/DFeppzhx/dtlicrIBzzHb8Mlpy6W8GrVa20e EG2NZtcyE/7DX6iPArSJ9d2FWHyRtKqNbLZlmO/Ho+YD22H5sIof76Anh84Q7A== 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=5d526e9361fed45d5c875407acb6293c17cbd1b3 commit 5d526e9361fed45d5c875407acb6293c17cbd1b3 Author: Mark Johnston AuthorDate: 2022-02-10 20:32:23 +0000 Commit: Mark Johnston CommitDate: 2022-02-21 14:57:30 +0000 libctf: Rip out CTFv1 support CTFv1 was obsolete before libctf was imported into FreeBSD, and ctfconvert/ctfmerge can emit only CTFv2. Make ctf.h a bit easier to maintain by ripping v1 support out. No functional change intended. Sponsored by: The FreeBSD Foundation (cherry picked from commit 7db423d69273644d3be2a65a48a67b9e0cfb0147) --- cddl/contrib/opensolaris/common/ctf/ctf_open.c | 36 +------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/cddl/contrib/opensolaris/common/ctf/ctf_open.c b/cddl/contrib/opensolaris/common/ctf/ctf_open.c index 001cf5c59104..d64337a68bff 100644 --- a/cddl/contrib/opensolaris/common/ctf/ctf_open.c +++ b/cddl/contrib/opensolaris/common/ctf/ctf_open.c @@ -44,36 +44,18 @@ const char _CTF_NULLSTR[] = ""; int _libctf_version = CTF_VERSION; /* library client version */ int _libctf_debug = 0; /* debugging messages enabled */ -static ushort_t -get_kind_v1(ushort_t info) -{ - return (CTF_INFO_KIND_V1(info)); -} - static ushort_t get_kind_v2(ushort_t info) { return (CTF_INFO_KIND(info)); } -static ushort_t -get_root_v1(ushort_t info) -{ - return (CTF_INFO_ISROOT_V1(info)); -} - static ushort_t get_root_v2(ushort_t info) { return (CTF_INFO_ISROOT(info)); } -static ushort_t -get_vlen_v1(ushort_t info) -{ - return (CTF_INFO_VLEN_V1(info)); -} - static ushort_t get_vlen_v2(ushort_t info) { @@ -82,7 +64,7 @@ get_vlen_v2(ushort_t info) static const ctf_fileops_t ctf_fileops[] = { { NULL, NULL }, - { get_kind_v1, get_root_v1, get_vlen_v1 }, + { NULL, NULL }, { get_kind_v2, get_root_v2, get_vlen_v2 }, }; @@ -588,22 +570,6 @@ ctf_bufopen(const ctf_sect_t *ctfsect, const ctf_sect_t *symsect, bcopy(ctfsect->cts_data, &hp, sizeof (hp)); hdrsz = sizeof (ctf_header_t); - } else if (pp->ctp_version == CTF_VERSION_1) { - const ctf_header_v1_t *h1p = - (const ctf_header_v1_t *)ctfsect->cts_data; - - if (ctfsect->cts_size < sizeof (ctf_header_v1_t)) - return (ctf_set_open_errno(errp, ECTF_NOCTFBUF)); - - bzero(&hp, sizeof (hp)); - hp.cth_preamble = h1p->cth_preamble; - hp.cth_objtoff = h1p->cth_objtoff; - hp.cth_funcoff = h1p->cth_funcoff; - hp.cth_typeoff = h1p->cth_typeoff; - hp.cth_stroff = h1p->cth_stroff; - hp.cth_strlen = h1p->cth_strlen; - - hdrsz = sizeof (ctf_header_v1_t); } else return (ctf_set_open_errno(errp, ECTF_CTFVERS));