From nobody Wed Mar 02 13:59:40 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 7B3FE19EECAB; Wed, 2 Mar 2022 13:59:41 +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 4K7wj91Ts9z52xX; Wed, 2 Mar 2022 13:59:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646229581; 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=vNwSb17SqLLFDHP53adaktNTYDJVjtcwC/OO2DNbwfw=; b=XtLdIe2hB/BXjhCdqPmWl/O0F6+EZV8zaQ4YZsoD7P23BX13eJZkZ1Bi9NcxIhPczg3EbR DnoTJ8DYXJAL31Lor6M41/nElCZOrGDXCCOAETCBlJNxndbvfukhqLfNw075ejLlT3YEV1 ZE4NxoW4PbYbF0Mf4c5VnMiOY8A+/3uDvfo34M2u84tcQUMS9P6Zz9AoG/jW+WjHvFcumU ypsK2YScUy5oAW2Rhk1r9Ojsa8ZfxDJIQGQcU4IfxwXo9LAR8Bv3pD8z5kykDelWtmOvNM kvWYAKWv/sVJGNG0ecx0DcEGvec03uKG2/S9BYZUaLCGh4EhHlVPVaxmiehOXg== 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 E4D6424998; Wed, 2 Mar 2022 13:59:40 +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 222DxeJn020586; Wed, 2 Mar 2022 13:59:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 222Dxex3020585; Wed, 2 Mar 2022 13:59:40 GMT (envelope-from git) Date: Wed, 2 Mar 2022 13:59:40 GMT Message-Id: <202203021359.222Dxex3020585@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: 2d30593c2428 - stable/13 - libctf: Use const ctf_file_t references in string lookup routines 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: 2d30593c2428417d007ae0abd995909d3413192c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646229581; 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=vNwSb17SqLLFDHP53adaktNTYDJVjtcwC/OO2DNbwfw=; b=CAtr3aGxV3yvFDS1kNLdXf0q8aSmenwCtHiKH0ZOEUZ+fru2YgwVfuRA5Q04t3su4DyPiu W9S/jGe59gvPqVIGDz1aNlASLFUHS3T4i92LlCwD1qWh0Ak3Uwx0wHEn2UMBXseq42E7yr tS/J8EDYvIA1ze9jWkzfjhjqc/XbYZUhTqMHINEWpGzQwcFxP4Vk1jj6heVZD2LkEyoxc+ YAfYW6l6CbhmWZXn8WJosGnh0KqA6pNNGptyqzI7JP9Xuky5KQmRMfx0B9QSqdq9XlAHMi cx9vpO1gFGheocH+iLRPIoVPh8WOGBB7Zgxd0BTJZJFkL/VQAgnHGV9sdrEDcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646229581; a=rsa-sha256; cv=none; b=cJpiOy66K2T2RRhBYo+l2c609o+2L13opUZ7WgYwpNwv3Ih3KBRrIzOlm97I9XAHLKK30p R/pXEZ2GlrG1sPaAeKVtZ3zFyuQeo7Z6xV9opeSIns8zis09cp0fv0t7CpKfzYNBXBYesn oijV6zhGr6uuux63kNwN+Vp+ncC9qXpYf5QbBdZchGkDQY2urSYJADlyDkXy9zPlqDpvsO lI4JD6bXm9Pllany+Y/cMi3VKXEEN92jUye9iQCCV1enET2eec0fbwpkHQ2kVYo0OV+xLD OOUFy3K32lHJ/ZK0jDi3xkL+tQLihYTa7qWspXjjjESpoW3f8y+WA6tzGQMivQ== 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=2d30593c2428417d007ae0abd995909d3413192c commit 2d30593c2428417d007ae0abd995909d3413192c Author: Mark Johnston AuthorDate: 2022-02-23 23:37:40 +0000 Commit: Mark Johnston CommitDate: 2022-03-02 13:59:25 +0000 libctf: Use const ctf_file_t references in string lookup routines Sponsored by: The FreeBSD Foundation (cherry picked from commit 45c23c2608ec3e34b5c7ce18eca91a46419e363c) --- cddl/contrib/opensolaris/common/ctf/ctf_impl.h | 4 ++-- cddl/contrib/opensolaris/common/ctf/ctf_util.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cddl/contrib/opensolaris/common/ctf/ctf_impl.h b/cddl/contrib/opensolaris/common/ctf/ctf_impl.h index f56fa6a00548..dd6167856074 100644 --- a/cddl/contrib/opensolaris/common/ctf/ctf_impl.h +++ b/cddl/contrib/opensolaris/common/ctf/ctf_impl.h @@ -305,8 +305,8 @@ extern void ctf_decl_fini(ctf_decl_t *); extern void ctf_decl_push(ctf_decl_t *, ctf_file_t *, ctf_id_t); extern void ctf_decl_sprintf(ctf_decl_t *, const char *, ...); -extern const char *ctf_strraw(ctf_file_t *, uint_t); -extern const char *ctf_strptr(ctf_file_t *, uint_t); +extern const char *ctf_strraw(const ctf_file_t *, uint_t); +extern const char *ctf_strptr(const ctf_file_t *, uint_t); extern ctf_file_t *ctf_set_open_errno(int *, int); extern long ctf_set_errno(ctf_file_t *, int); diff --git a/cddl/contrib/opensolaris/common/ctf/ctf_util.c b/cddl/contrib/opensolaris/common/ctf/ctf_util.c index 740d403e8c52..d3d9a65211bb 100644 --- a/cddl/contrib/opensolaris/common/ctf/ctf_util.c +++ b/cddl/contrib/opensolaris/common/ctf/ctf_util.c @@ -96,9 +96,9 @@ ctf_list_delete(ctf_list_t *lp, void *existing) * up the appropriate string table buffer and then adding the offset. */ const char * -ctf_strraw(ctf_file_t *fp, uint_t name) +ctf_strraw(const ctf_file_t *fp, uint_t name) { - ctf_strs_t *ctsp = &fp->ctf_str[CTF_NAME_STID(name)]; + const ctf_strs_t *ctsp = &fp->ctf_str[CTF_NAME_STID(name)]; if (ctsp->cts_strs != NULL && CTF_NAME_OFFSET(name) < ctsp->cts_len) return (ctsp->cts_strs + CTF_NAME_OFFSET(name)); @@ -108,7 +108,7 @@ ctf_strraw(ctf_file_t *fp, uint_t name) } const char * -ctf_strptr(ctf_file_t *fp, uint_t name) +ctf_strptr(const ctf_file_t *fp, uint_t name) { const char *s = ctf_strraw(fp, name); return (s != NULL ? s : "(?)");