From nobody Thu Feb 10 20:42:03 2022 X-Original-To: dev-commits-src-main@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 F30CB19CD567; Thu, 10 Feb 2022 20:42:03 +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 4JvpZg60KKz3wMN; Thu, 10 Feb 2022 20:42:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644525723; 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=c5LH1l6v5ZgFNY0oKmAw++XDwbCSCtRZezkyg7jeSwQ=; b=qYstbWxBOH1iDjVRpsvYtdkSLpSyRQRAVToCo4avD9GCan0/ZiWWV3skEJDJet0yOw1iy/ Z1xvN13dmxYVdhQrCaXQX90v8sTIphqwnB0LOxosGuN31xE60nCtnHV+lTOH8K7gSPsaaQ XvaqQWKAkWhy3vacq/OO0Llpf+LjNIEaUfdzSUC9CxSNWzyk7TCTNzUPCjSjOJDY1bif0c GZ/SddCzqVA613cgq4e8PXBaZzKF/WAo4tyu9AWIWUhrPVAg/qNomTGB5DeMlLzf8MGU60 8+jmAMcYc8Tf9IuFMaT4wCM83tuv3QLT1dTMU6pYb00db4wkVOJk+TztPbPfBA== 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 9F7BC27411; Thu, 10 Feb 2022 20:42:03 +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 21AKg3cC014679; Thu, 10 Feb 2022 20:42:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21AKg3C0014678; Thu, 10 Feb 2022 20:42:03 GMT (envelope-from git) Date: Thu, 10 Feb 2022 20:42:03 GMT Message-Id: <202202102042.21AKg3C0014678@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 7db423d69273 - main - libctf: Rip out CTFv1 support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 7db423d69273644d3be2a65a48a67b9e0cfb0147 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644525723; 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=c5LH1l6v5ZgFNY0oKmAw++XDwbCSCtRZezkyg7jeSwQ=; b=WpZv8jjpr3UkyPo6QVrZhnjx0ijZqJ9uUSHtaDgdOmdafbh2sULtszweQpriOt12acZWeV Cw0WHMT0CGE6ksoRFk795bXUKoDwn6GXpX4YrJIY2VQWhp6LUV78jZ89FyleOGkLGRU2E4 fXB9h3mTtlRh/ENXV/0CjUylHdy2dg6KvTnZvVyoHTtrg/c0puY72AaSeXPvz9T8CmnHVN A7iXIJkD0wUIYBLuLDHDE/NK9nzcImI64f9WhDSXYHCOGWvvqvKsBkXhK/XmbQL/KCDQxv EZ/hfMQVVs+mhjzPbS9Zoz/J5qAXY5nnLQ3nDzBbppmBZv26UYAMO3Wpy6pnOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644525723; a=rsa-sha256; cv=none; b=AQL1WLEVBpXQXi/l1mogd5GJo7WE5t2v39BM8YREBDOAPPlk/o/Et3S2ETXUw4YyKxpGfw gjokAlUYv56DAaogWkiYD+k9zPhGAKkKB8whKEFAYhB5nFavsSAQUjMfBO4Bak1a+iyuya hunyqqGnA2kOlqp/nZPZ1kFRmVHXhWoVCtPku69IfBQKiyKSoleCilD/e3N6LVHMlql9bk RnkiIPo7+C+8d5X3TPYkTnAVgbYboazHYqL09ml1Ez6TAQy1CliN5l1sLA+JSKl+aACxV/ b6QbqhUtiXqa8WxrAb3QI3/Mtyyx8CN6ykVMXFjfpiUODQ1jtKlAipPLs6d6lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7db423d69273644d3be2a65a48a67b9e0cfb0147 commit 7db423d69273644d3be2a65a48a67b9e0cfb0147 Author: Mark Johnston AuthorDate: 2022-02-10 20:32:23 +0000 Commit: Mark Johnston CommitDate: 2022-02-10 20:39:59 +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. MFC after: 1 week Sponsored by: The FreeBSD Foundation --- 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));