From nobody Wed Feb 23 23:44: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 73C8119DE5A0; Wed, 23 Feb 2022 23:44: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 4K3t0g2nd4z4s5n; Wed, 23 Feb 2022 23:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645659843; 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=flc80Va99QY6IDVc10SK/BUHfDtr4N3EalvxUwt+e60=; b=NeQTR/rI/9viEccWoDEHZKM/kc++usFTmhChsakQUjyv/kAzKCjyDolysA+fMInCbHDTvr XH+kQXXDfzZuSseWVTxT0JB3LYCEkhIiLrwKmFancalHW65kErhlSCsgHNTVzSBbbPyjOQ wZIiiWm4oKXLLDdHmGhMJRWlL1kZyJRhe41skOXuJ+9nzGGSgUeGSxm9XWw+qM/+b/45pd EXnBiHZlcRyWjdMdWkE2kswe42PCH5Ge/8kVgNQt54qLQMd/CEYJUIWpN9ExLzW+kTDha7 Yi132wv2Xw+UjFXToLEGlVGEK3fYlBHs2e98xdWr/82MfpCxX8RI6VFgQ/KqFg== 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 3FA1821362; Wed, 23 Feb 2022 23:44: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 21NNi335071668; Wed, 23 Feb 2022 23:44:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21NNi3WP071667; Wed, 23 Feb 2022 23:44:03 GMT (envelope-from git) Date: Wed, 23 Feb 2022 23:44:03 GMT Message-Id: <202202232344.21NNi3WP071667@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: 45c23c2608ec - main - libctf: Use const ctf_file_t references in string lookup routines 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: 45c23c2608ec3e34b5c7ce18eca91a46419e363c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645659843; 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=flc80Va99QY6IDVc10SK/BUHfDtr4N3EalvxUwt+e60=; b=rtq18/p5WpagOes3FNwNYcmof0N3xGa4BiPjG9rXClzfO0rV5Eq9L1NSjiygtviIhwZqPz TbTHRf6y3MVo1a5Mvj0IfGKIhkxZuD+p36rez0OX9yvVSh/XnGpe+GgmC3PG1sAQK2kp+c j2o8OjITKDGscg96/hl4DEJVAOp9c6zTLfu7o0ZUjdysoMlLn1YQcEVdQ1Vh6gvU90FO8t zQFfX0czln3XiGVt5Cm44XJH91lTvf/aI/B3y2h6bG28+lFIL3rl0LWrjkQDwJjlirVRDX /tlLXw4QxLSGKtOBib91tcAB2QT88EKUmom2m6rQ39xAoSh3IaSG88E6pJJX1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645659843; a=rsa-sha256; cv=none; b=oQ1OMgavj/4jmBxVVRy0BBKx5EolHDRqZEMtJLWyyqre42vZ+afFJiRjjrBy9uXDMHj5+Z 4+qmBtHDtM/lRT0tehtUsD8X1rF4kpbKn2wBX3vAasKWAaNJkc953lTFl2QpNXhQIr33V2 9fftxQbBEqWyvP85iwZEIkHRbySYMlbApjUNPZl8/cSHpbq4SL3nX/77R5tgSn/Vc8g6+r j67ISGOUETdu34roT8FmMqmEclLnwvUHr30rC/UUg5OJ68WdRQa1nTnW2yDIcW7Uvtp/DC BtBn0gJocRPb/3nRrzrTA7a/TaiV+v5B0gtRSBHkB3S0i07BaKzGlYgJb2v1Cg== 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=45c23c2608ec3e34b5c7ce18eca91a46419e363c commit 45c23c2608ec3e34b5c7ce18eca91a46419e363c Author: Mark Johnston AuthorDate: 2022-02-23 23:37:40 +0000 Commit: Mark Johnston CommitDate: 2022-02-23 23:43:51 +0000 libctf: Use const ctf_file_t references in string lookup routines MFC after: 1 week Sponsored by: The FreeBSD Foundation --- 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 : "(?)");