Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the array of dtype names instead of hand-rolling our own.

This commit is contained in:
christos 2004-12-18 08:43:35 +00:00
parent a21d3f17b5
commit b30695cd1d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
usr.sbin/pstat/pstat.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pstat.c,v 1.87 2004/12/09 01:14:59 matt Exp $ */
/* $NetBSD: pstat.c,v 1.88 2004/12/18 08:43:35 christos Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993, 1994
@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1991, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)pstat.c 8.16 (Berkeley) 5/9/95";
#else
__RCSID("$NetBSD: pstat.c,v 1.87 2004/12/09 01:14:59 matt Exp $");
__RCSID("$NetBSD: pstat.c,v 1.88 2004/12/18 08:43:35 christos Exp $");
#endif
#endif /* not lint */
@ -106,6 +106,9 @@ char *nlistf = NULL;
char *memf = NULL;
kvm_t *kd;
static const char * const dtypes[] = { DTYPE_NAMES };
static const struct {
u_int m_flag;
u_int m_visible;
@ -880,8 +883,6 @@ filemode()
char flags[sizeof(filemode_flags) / sizeof(filemode_flags[0])];
char *buf, *offset;
int len, maxfile, nfile, ovflw;
static const char * const dtypes[] =
{ "???", "inode", "socket", "pipe" };
KGET(FNL_MAXFILE, maxfile);
if (totalflag) {
@ -905,7 +906,7 @@ filemode()
(PTRSTRWIDTH - 4) / 2, "", " LOC", (PTRSTRWIDTH - 4) / 2, "",
(PTRSTRWIDTH - 4) / 2, "", "DATA", (PTRSTRWIDTH - 4) / 2, "");
for (; (char *)fp < offset + len; addr = fp->f_list.le_next, fp++) {
if ((unsigned)fp->f_type > DTYPE_PIPE)
if ((unsigned)fp->f_type > sizeof(dtypes) / sizeof(dtypes[0]))
continue;
ovflw = 0;
(void)getflags(filemode_flags, flags, fp->f_flag);