Module Name: src
Committed By: dholland
Date: Sun Apr 20 22:48:59 UTC 2014
Modified Files:
src/bin/ps: extern.h print.c ps.h
Log Message:
Use an enum type for PRINTMODE vs. WIDTHMODE. Compiler output diffs have
been checked.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/bin/ps/extern.h
cvs rdiff -u -r1.121 -r1.122 src/bin/ps/print.c
cvs rdiff -u -r1.26 -r1.27 src/bin/ps/ps.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/ps/extern.h
diff -u src/bin/ps/extern.h:1.34 src/bin/ps/extern.h:1.35
--- src/bin/ps/extern.h:1.34 Wed Jan 15 08:07:53 2014
+++ src/bin/ps/extern.h Sun Apr 20 22:48:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.34 2014/01/15 08:07:53 mlelstv Exp $ */
+/* $NetBSD: extern.h,v 1.35 2014/04/20 22:48:59 dholland Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -46,54 +46,54 @@ extern VAR var[];
extern VARLIST displaylist;
extern VARLIST sortlist;
-void command(void *, VARENT *, int);
-void cpuid(void *, VARENT *, int);
-void cputime(void *, VARENT *, int);
+void command(void *, VARENT *, enum mode);
+void cpuid(void *, VARENT *, enum mode);
+void cputime(void *, VARENT *, enum mode);
int donlist(void);
int donlist_sysctl(void);
void fmt_puts(char *, int *);
void fmt_putc(int, int *);
-void elapsed(void *, VARENT *, int);
+void elapsed(void *, VARENT *, enum mode);
double getpcpu(const struct kinfo_proc2 *);
double getpmem(const struct kinfo_proc2 *);
-void gname(void *, VARENT *, int);
-void groups(void *, VARENT *, int);
-void groupnames(void *, VARENT *, int);
-void lcputime(void *, VARENT *, int);
-void logname(void *, VARENT *, int);
-void longtname(void *, VARENT *, int);
-void lname(void *, VARENT *, int);
-void lstarted(void *, VARENT *, int);
-void lstate(void *, VARENT *, int);
-void maxrss(void *, VARENT *, int);
+void gname(void *, VARENT *, enum mode);
+void groups(void *, VARENT *, enum mode);
+void groupnames(void *, VARENT *, enum mode);
+void lcputime(void *, VARENT *, enum mode);
+void logname(void *, VARENT *, enum mode);
+void longtname(void *, VARENT *, enum mode);
+void lname(void *, VARENT *, enum mode);
+void lstarted(void *, VARENT *, enum mode);
+void lstate(void *, VARENT *, enum mode);
+void maxrss(void *, VARENT *, enum mode);
void nlisterr(struct nlist *);
-void p_rssize(void *, VARENT *, int);
-void pagein(void *, VARENT *, int);
+void p_rssize(void *, VARENT *, enum mode);
+void pagein(void *, VARENT *, enum mode);
void parsefmt(const char *);
void parsefmt_insert(const char *, VARENT **);
void parsesort(const char *);
VARENT * varlist_find(VARLIST *, const char *);
-void emul(void *, VARENT *, int);
-void pcpu(void *, VARENT *, int);
-void pmem(void *, VARENT *, int);
-void pnice(void *, VARENT *, int);
-void pri(void *, VARENT *, int);
+void emul(void *, VARENT *, enum mode);
+void pcpu(void *, VARENT *, enum mode);
+void pmem(void *, VARENT *, enum mode);
+void pnice(void *, VARENT *, enum mode);
+void pri(void *, VARENT *, enum mode);
void printheader(void);
-void putimeval(void *, VARENT *, int);
-void pvar(void *, VARENT *, int);
-void rgname(void *, VARENT *, int);
-void rssize(void *, VARENT *, int);
-void runame(void *, VARENT *, int);
+void putimeval(void *, VARENT *, enum mode);
+void pvar(void *, VARENT *, enum mode);
+void rgname(void *, VARENT *, enum mode);
+void rssize(void *, VARENT *, enum mode);
+void runame(void *, VARENT *, enum mode);
void showkey(void);
-void started(void *, VARENT *, int);
-void state(void *, VARENT *, int);
-void svgname(void *, VARENT *, int);
-void svuname(void *, VARENT *, int);
-void tdev(void *, VARENT *, int);
-void tname(void *, VARENT *, int);
-void tsize(void *, VARENT *, int);
-void ucomm(void *, VARENT *, int);
-void uname(void *, VARENT *, int);
-void uvar(void *, VARENT *, int);
-void vsize(void *, VARENT *, int);
-void wchan(void *, VARENT *, int);
+void started(void *, VARENT *, enum mode);
+void state(void *, VARENT *, enum mode);
+void svgname(void *, VARENT *, enum mode);
+void svuname(void *, VARENT *, enum mode);
+void tdev(void *, VARENT *, enum mode);
+void tname(void *, VARENT *, enum mode);
+void tsize(void *, VARENT *, enum mode);
+void ucomm(void *, VARENT *, enum mode);
+void uname(void *, VARENT *, enum mode);
+void uvar(void *, VARENT *, enum mode);
+void vsize(void *, VARENT *, enum mode);
+void wchan(void *, VARENT *, enum mode);
Index: src/bin/ps/print.c
diff -u src/bin/ps/print.c:1.121 src/bin/ps/print.c:1.122
--- src/bin/ps/print.c:1.121 Wed Jan 15 08:07:53 2014
+++ src/bin/ps/print.c Sun Apr 20 22:48:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: print.c,v 1.121 2014/01/15 08:07:53 mlelstv Exp $ */
+/* $NetBSD: print.c,v 1.122 2014/04/20 22:48:59 dholland Exp $ */
/*
* Copyright (c) 2000, 2007 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
#if 0
static char sccsid[] = "@(#)print.c 8.6 (Berkeley) 4/16/94";
#else
-__RCSID("$NetBSD: print.c,v 1.121 2014/01/15 08:07:53 mlelstv Exp $");
+__RCSID("$NetBSD: print.c,v 1.122 2014/04/20 22:48:59 dholland Exp $");
#endif
#endif /* not lint */
@@ -93,12 +93,12 @@ __RCSID("$NetBSD: print.c,v 1.121 2014/0
#include "ps.h"
static char *cmdpart(char *);
-static void printval(void *, VAR *, int);
+static void printval(void *, VAR *, enum mode);
static int titlecmp(char *, char **);
-static void doubleprintorsetwidth(VAR *, double, int, int);
-static void intprintorsetwidth(VAR *, int, int);
-static void strprintorsetwidth(VAR *, const char *, int);
+static void doubleprintorsetwidth(VAR *, double, int, enum mode);
+static void intprintorsetwidth(VAR *, int, enum mode);
+static void strprintorsetwidth(VAR *, const char *, enum mode);
static time_t now;
@@ -218,7 +218,7 @@ titlecmp(char *name, char **argv)
}
static void
-doubleprintorsetwidth(VAR *v, double val, int prec, int mode)
+doubleprintorsetwidth(VAR *v, double val, int prec, enum mode mode)
{
int fmtlen;
@@ -240,7 +240,7 @@ doubleprintorsetwidth(VAR *v, double val
}
static void
-intprintorsetwidth(VAR *v, int val, int mode)
+intprintorsetwidth(VAR *v, int val, enum mode mode)
{
int fmtlen;
@@ -261,7 +261,7 @@ intprintorsetwidth(VAR *v, int val, int
}
static void
-strprintorsetwidth(VAR *v, const char *str, int mode)
+strprintorsetwidth(VAR *v, const char *str, enum mode mode)
{
int len;
@@ -278,7 +278,7 @@ strprintorsetwidth(VAR *v, const char *s
}
void
-command(void *arg, VARENT *ve, int mode)
+command(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_proc2 *ki;
VAR *v;
@@ -359,7 +359,7 @@ command(void *arg, VARENT *ve, int mode)
}
void
-groups(void *arg, VARENT *ve, int mode)
+groups(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_proc2 *ki;
VAR *v;
@@ -397,7 +397,7 @@ groups(void *arg, VARENT *ve, int mode)
}
void
-groupnames(void *arg, VARENT *ve, int mode)
+groupnames(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_proc2 *ki;
VAR *v;
@@ -434,7 +434,7 @@ groupnames(void *arg, VARENT *ve, int mo
}
void
-ucomm(void *arg, VARENT *ve, int mode)
+ucomm(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_proc2 *k;
VAR *v;
@@ -445,7 +445,7 @@ ucomm(void *arg, VARENT *ve, int mode)
}
void
-emul(void *arg, VARENT *ve, int mode)
+emul(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_proc2 *k;
VAR *v;
@@ -456,7 +456,7 @@ emul(void *arg, VARENT *ve, int mode)
}
void
-logname(void *arg, VARENT *ve, int mode)
+logname(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_proc2 *k;
VAR *v;
@@ -467,7 +467,7 @@ logname(void *arg, VARENT *ve, int mode)
}
void
-state(void *arg, VARENT *ve, int mode)
+state(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_proc2 *k;
int flag, is_zombie;
@@ -551,7 +551,7 @@ state(void *arg, VARENT *ve, int mode)
}
void
-lstate(void *arg, VARENT *ve, int mode)
+lstate(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_lwp *k;
int flag;
@@ -610,7 +610,7 @@ lstate(void *arg, VARENT *ve, int mode)
}
void
-pnice(void *arg, VARENT *ve, int mode)
+pnice(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_proc2 *k;
VAR *v;
@@ -621,7 +621,7 @@ pnice(void *arg, VARENT *ve, int mode)
}
void
-pri(void *arg, VARENT *ve, int mode)
+pri(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_lwp *l;
VAR *v;
@@ -632,7 +632,7 @@ pri(void *arg, VARENT *ve, int mode)
}
void
-uname(void *arg, VARENT *ve, int mode)
+uname(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_proc2 *k;
VAR *v;
@@ -643,7 +643,7 @@ uname(void *arg, VARENT *ve, int mode)
}
void
-runame(void *arg, VARENT *ve, int mode)
+runame(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_proc2 *k;
VAR *v;
@@ -654,7 +654,7 @@ runame(void *arg, VARENT *ve, int mode)
}
void
-svuname(void *arg, VARENT *ve, int mode)
+svuname(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_proc2 *k;
VAR *v;
@@ -665,7 +665,7 @@ svuname(void *arg, VARENT *ve, int mode)
}
void
-gname(void *arg, VARENT *ve, int mode)
+gname(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_proc2 *k;
VAR *v;
@@ -676,7 +676,7 @@ gname(void *arg, VARENT *ve, int mode)
}
void
-rgname(void *arg, VARENT *ve, int mode)
+rgname(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_proc2 *k;
VAR *v;
@@ -687,7 +687,7 @@ rgname(void *arg, VARENT *ve, int mode)
}
void
-svgname(void *arg, VARENT *ve, int mode)
+svgname(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_proc2 *k;
VAR *v;
@@ -698,7 +698,7 @@ svgname(void *arg, VARENT *ve, int mode)
}
void
-tdev(void *arg, VARENT *ve, int mode)
+tdev(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_proc2 *k;
VAR *v;
@@ -722,7 +722,7 @@ tdev(void *arg, VARENT *ve, int mode)
}
void
-tname(void *arg, VARENT *ve, int mode)
+tname(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_proc2 *k;
VAR *v;
@@ -757,7 +757,7 @@ tname(void *arg, VARENT *ve, int mode)
}
void
-longtname(void *arg, VARENT *ve, int mode)
+longtname(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_proc2 *k;
VAR *v;
@@ -779,7 +779,7 @@ longtname(void *arg, VARENT *ve, int mod
}
void
-started(void *arg, VARENT *ve, int mode)
+started(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_proc2 *k;
VAR *v;
@@ -815,7 +815,7 @@ started(void *arg, VARENT *ve, int mode)
}
void
-lstarted(void *arg, VARENT *ve, int mode)
+lstarted(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_proc2 *k;
VAR *v;
@@ -844,7 +844,7 @@ lstarted(void *arg, VARENT *ve, int mode
}
void
-elapsed(void *arg, VARENT *ve, int mode)
+elapsed(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_proc2 *k;
VAR *v;
@@ -938,7 +938,7 @@ elapsed(void *arg, VARENT *ve, int mode)
}
void
-wchan(void *arg, VARENT *ve, int mode)
+wchan(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_lwp *l;
VAR *v;
@@ -968,7 +968,7 @@ wchan(void *arg, VARENT *ve, int mode)
#define pgtok(a) (((a)*(size_t)getpagesize())/1024)
void
-vsize(void *arg, VARENT *ve, int mode)
+vsize(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_proc2 *k;
VAR *v;
@@ -979,7 +979,7 @@ vsize(void *arg, VARENT *ve, int mode)
}
void
-rssize(void *arg, VARENT *ve, int mode)
+rssize(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_proc2 *k;
VAR *v;
@@ -991,7 +991,7 @@ rssize(void *arg, VARENT *ve, int mode)
}
void
-p_rssize(void *arg, VARENT *ve, int mode) /* doesn't account for text */
+p_rssize(void *arg, VARENT *ve, enum mode mode) /* doesn't account for text */
{
struct kinfo_proc2 *k;
VAR *v;
@@ -1002,7 +1002,7 @@ p_rssize(void *arg, VARENT *ve, int mode
}
void
-cpuid(void *arg, VARENT *ve, int mode)
+cpuid(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_lwp *l;
VAR *v;
@@ -1013,7 +1013,7 @@ cpuid(void *arg, VARENT *ve, int mode)
}
static void
-cputime1(int32_t secs, int32_t psecs, VAR *v, int mode)
+cputime1(int32_t secs, int32_t psecs, VAR *v, enum mode mode)
{
int fmtlen;
@@ -1049,7 +1049,7 @@ cputime1(int32_t secs, int32_t psecs, VA
}
void
-cputime(void *arg, VARENT *ve, int mode)
+cputime(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_proc2 *k;
VAR *v;
@@ -1075,7 +1075,7 @@ cputime(void *arg, VARENT *ve, int mode)
}
void
-lcputime(void *arg, VARENT *ve, int mode)
+lcputime(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_lwp *l;
VAR *v;
@@ -1112,7 +1112,7 @@ getpcpu(const struct kinfo_proc2 *k)
}
void
-pcpu(void *arg, VARENT *ve, int mode)
+pcpu(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_proc2 *k;
VAR *v;
@@ -1144,7 +1144,7 @@ getpmem(const struct kinfo_proc2 *k)
}
void
-pmem(void *arg, VARENT *ve, int mode)
+pmem(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_proc2 *k;
VAR *v;
@@ -1155,7 +1155,7 @@ pmem(void *arg, VARENT *ve, int mode)
}
void
-pagein(void *arg, VARENT *ve, int mode)
+pagein(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_proc2 *k;
VAR *v;
@@ -1166,7 +1166,7 @@ pagein(void *arg, VARENT *ve, int mode)
}
void
-maxrss(void *arg, VARENT *ve, int mode)
+maxrss(void *arg, VARENT *ve, enum mode mode)
{
VAR *v;
@@ -1177,7 +1177,7 @@ maxrss(void *arg, VARENT *ve, int mode)
}
void
-tsize(void *arg, VARENT *ve, int mode)
+tsize(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_proc2 *k;
VAR *v;
@@ -1192,7 +1192,7 @@ tsize(void *arg, VARENT *ve, int mode)
* structures.
*/
static void
-printval(void *bp, VAR *v, int mode)
+printval(void *bp, VAR *v, enum mode mode)
{
static char ofmt[32] = "%";
int width, vok, fmtlen;
@@ -1390,7 +1390,7 @@ printval(void *bp, VAR *v, int mode)
}
void
-pvar(void *arg, VARENT *ve, int mode)
+pvar(void *arg, VARENT *ve, enum mode mode)
{
VAR *v;
@@ -1405,7 +1405,7 @@ pvar(void *arg, VARENT *ve, int mode)
}
void
-putimeval(void *arg, VARENT *ve, int mode)
+putimeval(void *arg, VARENT *ve, enum mode mode)
{
VAR *v = ve->var;
struct kinfo_proc2 *k = arg;
@@ -1457,7 +1457,7 @@ putimeval(void *arg, VARENT *ve, int mod
}
void
-lname(void *arg, VARENT *ve, int mode)
+lname(void *arg, VARENT *ve, enum mode mode)
{
struct kinfo_lwp *l;
VAR *v;
Index: src/bin/ps/ps.h
diff -u src/bin/ps/ps.h:1.26 src/bin/ps/ps.h:1.27
--- src/bin/ps/ps.h:1.26 Mon Oct 2 17:54:35 2006
+++ src/bin/ps/ps.h Sun Apr 20 22:48:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ps.h,v 1.26 2006/10/02 17:54:35 apb Exp $ */
+/* $NetBSD: ps.h,v 1.27 2014/04/20 22:48:59 dholland Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -35,8 +35,10 @@
#define UNLIMITED 0 /* unlimited terminal width */
-#define PRINTMODE 0 /* print values */
-#define WIDTHMODE 1 /* determine width of column */
+enum mode {
+ PRINTMODE = 0, /* print values */
+ WIDTHMODE = 1 /* determine width of column */
+};
enum type {
UNSPECIFIED,
@@ -65,7 +67,7 @@ typedef struct var {
#define ALIAS 0x40 /* entry is alias for 'header' */
u_int flag;
/* output routine */
- void (*oproc)(void *, struct varent *, int);
+ void (*oproc)(void *, struct varent *, enum mode);
/*
* The following (optional) elements are hooks for passing information
* to the generic output routine: pvar (that which prints simple
