From nobody Thu May 1 19:51:31 2025 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 4ZpPnc6vMYz5vfJv; Thu, 01 May 2025 19:51:32 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZpPnb5zgDz46V7; Thu, 01 May 2025 19:51:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746129091; 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=G3XIGYGpkQMQspTGe83MIU3s0OljQ4e7OVcduukZQC0=; b=EY7MtOVy7KAvecd1DtnnQx4JOlZoVaXOjov05iJgln4YHmosip8qiKoHOgLaAdqun+W3nI XQmNLYyh9uLFMwk8Qj0nAvZUoYiVo+XaeTnRhMeQqqdWdrcQ5FvUke8S8W5S1C4/K8UjZX 1vbu91O0oiezohaCWTqTquI5BQzyUgVYuzUZoDTeuezTLzrMfjIbZPPwgU5Wq7ge+8MsRL /XC3OkVVJaw9PgDjP6XeFkGT8XjIahYyTHwixp5Qq1zGsqyV+odN7DgFT5SAbnNFjEf77i 3Nks1uvDGhtBzkXwZyuSTxJklXPGV1fgIb4v91iho2so7M3mARkc9vxcHihQcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746129091; 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=G3XIGYGpkQMQspTGe83MIU3s0OljQ4e7OVcduukZQC0=; b=oSQiBaMuyDwZeV8PrYMUk0tgXTyMoeFNKMUGaNhHT0TOiCs/jH1Cm+7VJ84cmmhiAYf3sz 1FR6WSq16k3XOsiLPG8WaQlOZBTQ4+CgspZcIZ/W/lPlTxaD9+2ci6V/Nk8kh4nxughf+W vDiI8SmIuayGTfhx2orxCPbLvQ0bcCniOI4F+Pf8YR/9Y7JAO9e9h6o7okWuaCoK4ZV3lq HlnWj2XjirFkkVvnMz8ZQWQCY60d5K78n93+MJ91cSrI7wrkiCcjpwNaTV4XKkBU0mAoap 5LtrE31QemtsQjnFKFgyhq8XoNUvpmQ1jFKq5oN+5a5Y0eBZ3L7EHEZ6+QhnPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746129091; a=rsa-sha256; cv=none; b=D2T4wVk9Uz2YmhoqszXGjFJtFHesrotLM93xHEl1Xa90yoOQRiOZBLDdWpk/dbbLTHAeMv xGCvLB3yFg/chbSUKtIHReyEGj3qPj7TlgxWcf63/hlLv4LDLe2y5B+UgtFuDKpCFwyefI PWbvuhZ/11X7XEU6vo1hOj6FcBBUSc6ktkYETmBR7C+ung+pT1ORMVRkzABPBseD2r2uV/ rTyUaQYB93SNVwmxsheTdkE6KvD4wSRragoqdkgDUrdSTRWU8qDvIflH9atX7ParhQ4J6M vGyGA0bOf8/BVN+nNCbGs+qt3mcqVl/2cjqVZtTbIiZE+mbcUn4KcDcsKEfABQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZpPnb5Q1VzjBx; Thu, 01 May 2025 19:51:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 541JpVUM067279; Thu, 1 May 2025 19:51:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 541JpVOh067276; Thu, 1 May 2025 19:51:31 GMT (envelope-from git) Date: Thu, 1 May 2025 19:51:31 GMT Message-Id: <202505011951.541JpVOh067276@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 2a9ebb5da226 - stable/14 - ps(1): find_varentry() to take a name instead of a VAR 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2a9ebb5da2263958474b75187895520627b37335 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=2a9ebb5da2263958474b75187895520627b37335 commit 2a9ebb5da2263958474b75187895520627b37335 Author: Olivier Certner AuthorDate: 2025-02-28 09:25:31 +0000 Commit: Olivier Certner CommitDate: 2025-05-01 19:37:02 +0000 ps(1): find_varentry() to take a name instead of a VAR The only information that find_varentry() needs and uses is a keyword/var name. The rest of the fields in the passed VAR are unused. Changing its signature will ease introducing new calls to find_varentry() in subsequent commits, as there no VAR object will exist to be passed but just a name. Reviewed by: kib MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49609 (cherry picked from commit c1e5a7fdad631458768fc45a82b4d43bade8d0c8) --- bin/ps/extern.h | 2 +- bin/ps/keyword.c | 2 +- bin/ps/ps.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/ps/extern.h b/bin/ps/extern.h index 45485c77732e..94140f26d435 100644 --- a/bin/ps/extern.h +++ b/bin/ps/extern.h @@ -52,7 +52,7 @@ int donlist(void); char *elapsed(KINFO *, VARENT *); char *elapseds(KINFO *, VARENT *); char *emulname(KINFO *, VARENT *); -VARENT *find_varentry(VAR *); +VARENT *find_varentry(const char *); const char *fmt_argv(char **, char *, char *, size_t); double getpcpu(const KINFO *); char *jailname(KINFO *, VARENT *); diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c index 9b733e0416ba..21330ed9e2ac 100644 --- a/bin/ps/keyword.c +++ b/bin/ps/keyword.c @@ -293,7 +293,7 @@ parsefmt(const char *p, struct velisthead *const var_list, * get on with our lives if this VAR is already * represented in the list. */ - vent = find_varentry(v); + vent = find_varentry(v->name); if (vent != NULL) continue; } diff --git a/bin/ps/ps.c b/bin/ps/ps.c index deb24c4785cb..14dea797a7f7 100644 --- a/bin/ps/ps.c +++ b/bin/ps/ps.c @@ -1205,12 +1205,12 @@ init_list(struct listinfo *inf, addelem_rtn artn, int elemsize, } VARENT * -find_varentry(VAR *v) +find_varentry(const char *name) { struct varent *vent; STAILQ_FOREACH(vent, &varlist, next_ve) { - if (strcmp(vent->var->name, v->name) == 0) + if (strcmp(vent->var->name, name) == 0) return vent; } return NULL;