From nobody Thu May 1 19:51:38 2025 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 4ZpPnl1hvFz5vf36; Thu, 01 May 2025 19:51:39 +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 4ZpPnk2vGgz46dN; Thu, 01 May 2025 19:51:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746129098; 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=gUhGXu6q8e2otFK03D9Si+4GmVbvvtR7rNtKyyYsaWw=; b=NLO8JY8eoON7FmeLJ1wU6D7iZ6BrqbQUaqWRkXzRNiTQfuNfW3F0heLid4SFI3QSnhjsGS 8uwfHMczJ8zogpg75GSjc3THhEEpguSzCgTLbm6/klGoYGQQOzg9I6SBMFjRla7/goN0RD dNrJzPObC02GBj8drqWkpaeiZMb4wBtiBKo4gCTtH6ekW3zj7tAKjZ7ft+EEv8wmD9wQdq dEMpTOSPifenRWfjNLIhLuD21fyTGe0WViQH22CJWF5aRJbAA6lkMOFwl7jcXRQU+1Bhzs 6XJChk+CRuvMyTga4M39b86jfXMBGKf9lSdPfgZf1RFBx9v+khduea0djKn4Jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746129098; 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=gUhGXu6q8e2otFK03D9Si+4GmVbvvtR7rNtKyyYsaWw=; b=Q9vyxUbTvSaCDQWq1yyp26IQsZGnXDTrL+NYuHl9K+xBmEBWcQZJqEUJzI6cVs3SQojV3e /xkfTDNVyB7q8d1w6U8eSIqTWI2Khf6eu8GKS25+h6Mb8zcrkvqpYqd01ygoBz6fvJq9Qh TuHoxjoRq/HlWHcXrpXx5J/TIkqMtXV/TKsEZZOIrZxaVmF4X+gveMJzmeEqlWtFTCpVTY EjQtjeGePd6xgFsSX09rILF1+G0eeW1sf22OzkopsCzEktJipwZ7N4qcpYNWigkrJqe6TA CdrfMkA8GzOQm4pv1gDJlPxZhBOJHg2vavnwey4E3cQnvJwHmqUrom8sgLtMsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746129098; a=rsa-sha256; cv=none; b=w8wcj7G+V0xEeB+7dbAH29OOIarehq39TLDJOzViGcbXg1dbed92PLeuaQmgjeiL3Kw0lh f/baCMB0ztehtZo5zN6Z+TvSWyuVhNK0MFZfV0CeR3DxvFy1dI4eYgDOYYQgBOXo+iQyED 3fCG7FVlA1eTXIrFlT6pJodeXyCgj3NpRh/fA8hRcPGr6ghQeYFgVdKywEFpyT1MSd1PHB euiUohZNIwPMYfNu5OIh7y9Gk/DYj8A+or1D6xP3M9Fz1aF1sJqDQUbVJ9BhWLLS3x9vCN 5KoVD2sMd04K087I/Tm7BFtlVnlIs4s3G7JwGNFabaodyBquhTeBCuBP0Ozhwg== 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 4ZpPnk2SyJzhjK; Thu, 01 May 2025 19:51:38 +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 541JpcG7067509; Thu, 1 May 2025 19:51:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 541JpcCJ067505; Thu, 1 May 2025 19:51:38 GMT (envelope-from git) Date: Thu, 1 May 2025 19:51:38 GMT Message-Id: <202505011951.541JpcCJ067505@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: 220800ca96ba - stable/14 - ps(1): Constify the format strings for canned displays 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 220800ca96bad51a4bbd26f4a21d633c71d8aaf9 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=220800ca96bad51a4bbd26f4a21d633c71d8aaf9 commit 220800ca96bad51a4bbd26f4a21d633c71d8aaf9 Author: Olivier Certner AuthorDate: 2025-04-01 12:50:26 +0000 Commit: Olivier Certner CommitDate: 2025-05-01 19:37:04 +0000 ps(1): Constify the format strings for canned displays Now that removal of non-explicitly-requested duplicate columns work with a O(n) algorithm, remove the ad-hoc optimization of crushing the canned displays' formats after first use and constify their format strings. No functional change intended. This change could also be useful if/when allowing, e.g., to double letters of canned displays to indicate their columns should not be subject to automatic removal of duplicates (e.g., 'ps -ll'). MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49614 (cherry picked from commit fd6b81712eb9a77bbe484954d18fe1fc4a27116b) --- bin/ps/ps.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/bin/ps/ps.c b/bin/ps/ps.c index 20f737cbff6d..03454cb2b6ee 100644 --- a/bin/ps/ps.c +++ b/bin/ps/ps.c @@ -169,16 +169,16 @@ static void remove_redundant_columns(struct keyword_info *); static void pidmax_init(void); static void usage(void); -static char dfmt[] = "pid,tt,state,time,command"; -static char jfmt[] = "user,pid,ppid,pgid,sid,jobc,state,tt,time,command"; -static char lfmt[] = "uid,pid,ppid,cpu,pri,nice,vsz,rss,mwchan,state," - "tt,time,command"; -static char o1[] = "pid"; -static char o2[] = "tt,state,time,command"; -static char ufmt[] = "user,pid,%cpu,%mem,vsz,rss,tt,state,start,time,command"; -static char vfmt[] = "pid,state,time,sl,re,pagein,vsz,rss,lim,tsiz," - "%cpu,%mem,command"; -static char Zfmt[] = "label"; +static const char dfmt[] = "pid,tt,state,time,command"; +static const char jfmt[] = "user,pid,ppid,pgid,sid,jobc,state,tt,time,command"; +static const char lfmt[] = "uid,pid,ppid,cpu,pri,nice,vsz,rss,mwchan,state," + "tt,time,command"; +static const char o1[] = "pid"; +static const char o2[] = "tt,state,time,command"; +static const char ufmt[] = "user,pid,%cpu,%mem,vsz,rss,tt,state,start,time,command"; +static const char vfmt[] = "pid,state,time,sl,re,pagein,vsz,rss,lim,tsiz," + "%cpu,%mem,command"; +static const char Zfmt[] = "label"; #define PS_ARGS "AaCcD:de" OPT_LAZY_f "G:gHhjJ:LlM:mN:O:o:p:rSTt:U:uvwXxZ" @@ -341,7 +341,6 @@ main(int argc, char *argv[]) case 'j': parsefmt(jfmt, &varlist, 0); _fmt = 1; - jfmt[0] = '\0'; break; case 'L': showkey(); @@ -349,7 +348,6 @@ main(int argc, char *argv[]) case 'l': parsefmt(lfmt, &varlist, 0); _fmt = 1; - lfmt[0] = '\0'; break; case 'M': memf = optarg; @@ -364,7 +362,6 @@ main(int argc, char *argv[]) parsefmt(o1, &varlist, 1); parsefmt(optarg, &varlist, 1); parsefmt(o2, &varlist, 1); - o1[0] = o2[0] = '\0'; _fmt = 1; break; case 'o': @@ -433,13 +430,11 @@ main(int argc, char *argv[]) parsefmt(ufmt, &varlist, 0); sortby = SORTCPU; _fmt = 1; - ufmt[0] = '\0'; break; case 'v': parsefmt(vfmt, &varlist, 0); sortby = SORTMEM; _fmt = 1; - vfmt[0] = '\0'; break; case 'w': if (wflag) @@ -467,7 +462,6 @@ main(int argc, char *argv[]) break; case 'Z': parsefmt(Zfmt, &varlist, 0); - Zfmt[0] = '\0'; break; case '?': default: