From nobody Mon Apr 28 12:23:23 2025 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 4ZmMzv5nYgz5vJPH; Mon, 28 Apr 2025 12:23:23 +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 4ZmMzv2MHQz3g2X; Mon, 28 Apr 2025 12:23:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745843003; 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=wEbuoj3Gn/HHuxsLyljYr3zWPSxEisgvs/eE24fs1Qs=; b=aEmISlSoTomk4ji/zet8BLPML/rSStj0pwuTY6o4jggt0raR0cg5SX7ydE4NGR0BwMxyrv qGDz39o/R6V/B6+LnZn9DrnY3WBKvKnj5FCqKxRk4T6qz0elbs+hzT+UTcUjk2aXEALh0Q 8PlENngX9oxbYqMwRRzKN6uz8s2Y7OLv97sF37IaVsvOcctHNaWh1FH7Z0WJRPlFFF+y3T GjfD3AYWWaTbbK6Xkkb7Oh8Yq9gBe2uT3IAPH/zgVbCxTdxm6PaW3F79af1z+0IDg7GVCU VSNEhCZO5zw4TEIo0xGKUgGgrsKjVJH8r9zQTk9SCRT2kNWrmez9OAXAkMgP1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745843003; a=rsa-sha256; cv=none; b=SOof4JQLnb6Ut+vzIl4+bsL5GkHzTzYPh1yIZjBilgFhxHUFi8sJq+w2+t5JpBnM9v3SR/ kYbfaggKKOHeBNyF7ek++Rv2uwWTJYlZf7tQULz0ybNPoCKk80QSTbIyxoqUEliOUOtAdP NHvEDHLyUSvTOU2AmfMgzgBd3j4EovbFC3AwV9wiDAWo6cNv44HfvAkZq6AHUi+q/JBwAA o0VdtHwmWKZ1w+zpmRSz9Ktm9i1pYb0jsBKEIwOD9wOMDxCfYeHTFlg1QGAhbg9r3sVrfx Kr55NTYVLJS+DmfVdkblWLQy2wn7PiEEwahflQ5mlZD69Vmv0x1DK3hlfzHNVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745843003; 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=wEbuoj3Gn/HHuxsLyljYr3zWPSxEisgvs/eE24fs1Qs=; b=qFlJ+y9hKVSqwdfrWpWnH6Go28bNtELFbmSPvw0Jy2YaC5E3epzW2nSKjzQC0QyEhxvQXw AsYGg0qY3Ie8p9znsZHtdqROC+JZy3SVhsTeEitnAu3yl0k6oXwLQnCQApHCQaaHttk7OG E22FQpdOCm60Z0gfV3IcvVPbHmpiiylNIMm0uAdF2rLDKI+l1UXBpAxnWGFtxuLEXBOtgQ 5d09ZaI9Ue3YYWK0VB5jiyua2HTawICaZ/2Zx3yvk85rFLZUi9SoPq6Fcw5fRFyGFAPhgx rI6gVKB1Wvl4faqnXn7i62dTJI0GXEclwSYmj/DU6OF4RwcfdiOzK0tYhc7Lmg== 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 4ZmMzv1fpDzbW1; Mon, 28 Apr 2025 12:23:23 +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 53SCNNKD025225; Mon, 28 Apr 2025 12:23:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53SCNNLu025222; Mon, 28 Apr 2025 12:23:23 GMT (envelope-from git) Date: Mon, 28 Apr 2025 12:23:23 GMT Message-Id: <202504281223.53SCNNLu025222@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: c1e5a7fdad63 - main - ps(1): find_varentry() to take a name instead of a VAR 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: c1e5a7fdad631458768fc45a82b4d43bade8d0c8 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=c1e5a7fdad631458768fc45a82b4d43bade8d0c8 commit c1e5a7fdad631458768fc45a82b4d43bade8d0c8 Author: Olivier Certner AuthorDate: 2025-02-28 09:25:31 +0000 Commit: Olivier Certner CommitDate: 2025-04-28 11:56:27 +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 --- 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 48c452aeb844..45b5969f3911 100644 --- a/bin/ps/extern.h +++ b/bin/ps/extern.h @@ -50,7 +50,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 72fe9e183aac..59011c906175 100644 --- a/bin/ps/keyword.c +++ b/bin/ps/keyword.c @@ -287,7 +287,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 a5ae43b7fad1..2a94b4c37f31 100644 --- a/bin/ps/ps.c +++ b/bin/ps/ps.c @@ -1180,12 +1180,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;