Conglomerate printing of ps_pgtok'd data into a PLONG type. I couldn't think

of a better name, except PINT, but I decided to go with assuming LONG to
be safe, rather than assuming INT.

1 files changed, 3 insertions, 18 deletions

diff --git a/bin/ps/print.c b/bin/ps/print.c
index 79ca1eb..e2ae4ad 100644
--- a/bin/ps/print.c
+++ b/bin/ps/print.c
@@ -319,15 +319,6 @@ s_runame(KINFO *k)
 
 
 void
-rss(KINFO *k, VARENT *ve)
-{
-	VAR *v;
-
-	v = ve->var;
-	(void)printf("%*ld", v->width, (long)ps_pgtok(k->ki_p->ki_rssize));
-}
-
-void
 tdev(KINFO *k, VARENT *ve)
 {
 	VAR *v;
@@ -630,15 +621,6 @@ maxrss(KINFO *k __unused, VARENT *ve)
 }
 
 void
-tsize(KINFO *k, VARENT *ve)
-{
-	VAR *v;
-
-	v = ve->var;
-	(void)printf("%*ld", v->width, (long)ps_pgtok(k->ki_p->ki_tsize));
-}
-
-void
 priorityr(KINFO *k, VARENT *ve)
 {
 	VAR *v;
@@ -714,6 +696,9 @@ printval(void *bp, VAR *v)
 	case KPTR:
 		(void)printf(ofmt, v->width, *(u_long *)bp);
 		break;
+	case PLONG:
+		(void)printf(ofmt, v->width, ps_pgtok(*(u_long *)bp));
+		break;
 	default:
 		errx(1, "unknown type %d", v->type);
 	}