summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmallett <jmallett@FreeBSD.org>2002-09-17 17:13:52 +0000
committerjmallett <jmallett@FreeBSD.org>2002-09-17 17:13:52 +0000
commit6d599b2b064066af12cda8927da88f691f9aa847 (patch)
tree17e8333e91e634ddf2863ca6cb491858d2458a5c
parentdd967ac5612427169892e17b13efb8485675f99a (diff)
downloadFreeBSD-src-6d599b2b064066af12cda8927da88f691f9aa847.zip
FreeBSD-src-6d599b2b064066af12cda8927da88f691f9aa847.tar.gz
Rename new PLONG type to PGTOK as the conversion is more important than the
size (which is mostly undefined anyway). Submitted by: bde
-rw-r--r--bin/ps/keyword.c4
-rw-r--r--bin/ps/print.c2
-rw-r--r--bin/ps/ps.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index f9873c67..01d2a94 100644
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -147,7 +147,7 @@ static VAR var[] = {
UINT, UIDFMT, 0},
{"rgroup", "RGROUP", NULL, LJUST|DSIZ, rgroupname, s_rgroupname,
USERLEN, 0, CHAR, NULL, 0},
- {"rss", "RSS", NULL, 0, kvar, NULL, 4, KOFF(ki_rssize), PLONG, "ld", 0},
+ {"rss", "RSS", NULL, 0, kvar, NULL, 4, KOFF(ki_rssize), PGTOK, "ld", 0},
{"rtprio", "RTPRIO", NULL, 0, priorityr, NULL, 7, KOFF(ki_pri), CHAR,
NULL, 0},
{"ruid", "RUID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_ruid),
@@ -180,7 +180,7 @@ static VAR var[] = {
PIDFMT, 0},
{"tsid", "TSID", NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_tsid), UINT,
PIDFMT, 0},
- {"tsiz", "TSIZ", NULL, 0, kvar, NULL, 4, KOFF(ki_tsize), PLONG, "ld", 0},
+ {"tsiz", "TSIZ", NULL, 0, kvar, NULL, 4, KOFF(ki_tsize), PGTOK, "ld", 0},
{"tt", "TT ", NULL, 0, tname, NULL, 4, 0, CHAR, NULL, 0},
{"tty", "TTY", NULL, LJUST, longtname, NULL, 8, 0, CHAR, NULL, 0},
{"ucomm", "UCOMM", NULL, LJUST, ucomm, NULL, MAXCOMLEN, 0, CHAR, NULL,
diff --git a/bin/ps/print.c b/bin/ps/print.c
index e2ae4ad..d0c43ee 100644
--- a/bin/ps/print.c
+++ b/bin/ps/print.c
@@ -696,7 +696,7 @@ printval(void *bp, VAR *v)
case KPTR:
(void)printf(ofmt, v->width, *(u_long *)bp);
break;
- case PLONG:
+ case PGTOK:
(void)printf(ofmt, v->width, ps_pgtok(*(u_long *)bp));
break;
default:
diff --git a/bin/ps/ps.h b/bin/ps/ps.h
index 63797a9..8ed85e9 100644
--- a/bin/ps/ps.h
+++ b/bin/ps/ps.h
@@ -35,7 +35,7 @@
*/
#define UNLIMITED 0 /* unlimited terminal width */
-enum type { CHAR, UCHAR, SHORT, USHORT, INT, UINT, LONG, ULONG, KPTR, PLONG };
+enum type { CHAR, UCHAR, SHORT, USHORT, INT, UINT, LONG, ULONG, KPTR, PGTOK };
typedef struct kinfo {
struct kinfo_proc *ki_p; /* kinfo_proc structure */
OpenPOWER on IntegriCloud