From nobody Mon Apr 28 12:23:29 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 4ZmN025pNkz5vJM1; Mon, 28 Apr 2025 12:23:30 +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 4ZmN016YByz3g9T; Mon, 28 Apr 2025 12:23:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745843010; 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=JsGYkfLaXudOXScaobols4b51Gedlv10PnPEDvajxPE=; b=uU67yRw+XQIuFaR0pQbaHsN0uiYo4WNe537azH0Se6nm27N+lY6KNrd7xovoRMhek8le3t 2phPG4IL8EDq2M0naEc6A8OAlmoCAX2y36XvCQP4MA3HtmFWq5fkFp9puSX/FuJ0DNrHms jqy+QI8E4WkuElZ5Kk1kGjUfLUfq1HdY+kc8+iORmXl43FGlVt2xseL48H2QpsnMi4j+Vt svDOKQCjBhNvUxh3jrH1J3LLXEtBD2KId6LGE6ZvuLOSebvEqz28YquzsYydY7efrhD1Qg kptC2nYHbZcNZ1O3mYvkjXsjq1BuHEf9hjmq1lDbOuoD6DduN4/M+72+LbQ5VQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745843010; a=rsa-sha256; cv=none; b=QTxiCDIh5EBrKh8Sq5V3bbj1tP7X44PXE/9D1ZcZdIF4CTwDw22XWa3wDhTXSnxz0s1Gs0 Ah+vzWMFpu/i+TqwuIF7BNCfIF5VdpY/MwI6qz2SUK/aPjOYgIyGLc8t94Wp31n7rF3Jce Zw0cg5oJGo32siTmB4r77Gmk83zSVOdp1QaLwGX0c83IuedGSBmwc7beleXfLaIX10iEGx BCsR2EsdvSvSOaMAEvw9zHs/oV3dZe0r5IKdqlKaLvFxkEd6eq8GqTFwIowcxJUxbbURu/ K1/bh4XTp+4VCI1YyjPP9fONn1IoWe9rGxUVwNqkGc6g8GEUpM2g/3EqV5LaLQ== 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=1745843010; 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=JsGYkfLaXudOXScaobols4b51Gedlv10PnPEDvajxPE=; b=RLE55PJkDAGy+G7X3Ur2dLRHRN8I6qkasbt+733mWUI9egMZR+xPU8WQv40iSdv0fBo2uE L7odEJFOzPmKT4nhdKW9iDojQUoIjxeCCny/mMRU8Ax2x+mGCjpcqk7TKUOprE0Peoto9P 89mRf8991fSCAPEkdkllFgntvWssWibgMe48bIVNG/V+jyENJpsMPPqfDQxT4Zsmn38g2j 85Yv+Ow+vIC8L40MUbyFQxU8nvs6BZHgIj3tw2t5yewYxNpdd3+ZjsN3eKeSNfxDWTGs3V 9CaVROsPJwwF3GVW0HdlF+WQOWle/gwp0b2CxiEiHIYxUNlifCcxpBfdnDxvbg== 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 4ZmN0165X7zbkY; Mon, 28 Apr 2025 12:23:29 +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 53SCNTpr025435; Mon, 28 Apr 2025 12:23:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53SCNT2o025432; Mon, 28 Apr 2025 12:23:29 GMT (envelope-from git) Date: Mon, 28 Apr 2025 12:23:29 GMT Message-Id: <202504281223.53SCNT2o025432@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: fd6b81712eb9 - main - ps(1): Constify the format strings for canned displays 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: fd6b81712eb9a77bbe484954d18fe1fc4a27116b Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=fd6b81712eb9a77bbe484954d18fe1fc4a27116b commit fd6b81712eb9a77bbe484954d18fe1fc4a27116b Author: Olivier Certner AuthorDate: 2025-04-01 12:50:26 +0000 Commit: Olivier Certner CommitDate: 2025-04-28 11:58:14 +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 --- 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 ccbe40bbbc45..0a4a289a6a63 100644 --- a/bin/ps/ps.c +++ b/bin/ps/ps.c @@ -147,16 +147,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:defG:gHhjJ:LlM:mN:O:o:p:rSTt:U:uvwXxZ" @@ -316,7 +316,6 @@ main(int argc, char *argv[]) case 'j': parsefmt(jfmt, &varlist, 0); _fmt = 1; - jfmt[0] = '\0'; break; case 'L': showkey(); @@ -324,7 +323,6 @@ main(int argc, char *argv[]) case 'l': parsefmt(lfmt, &varlist, 0); _fmt = 1; - lfmt[0] = '\0'; break; case 'M': memf = optarg; @@ -339,7 +337,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': @@ -408,13 +405,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) @@ -442,7 +437,6 @@ main(int argc, char *argv[]) break; case 'Z': parsefmt(Zfmt, &varlist, 0); - Zfmt[0] = '\0'; break; case '?': default: