d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Increased column widths for tty input watermark fields so that watermarks

Browse Source 
for 11520-byte buffers for 115200 bps are displayed properly.

Fixed my recent printf format error fixes.  %p is almost unusable
in tables, since its width and format are unknown/machine-dependent.
Use %8lx and cast pointers to (u_long)(void*).  This is still quite
broken, e.g., for machines with 64-bit pointers.
This commit is contained in:
bde 1998-08-19 01:32:28 +00:00
parent cfb14b7bd4
commit 219e3ca36e
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,7 @@ static const char copyright[] =
static char sccsid[] = "@(#)pstat.c 8.16 (Berkeley) 5/9/95";
#endif
static const char rcsid[] =
"$Id: pstat.c,v 1.35 1998/03/07 15:36:27 bde Exp $";
"$Id: pstat.c,v 1.36 1998/07/06 20:28:05 bde Exp $";
#endif /* not lint */
#include <sys/param.h>
@ -476,8 +476,8 @@ vnode_print(avnode, vp)
if (flag == 0)
*fp++ = '-';
*fp = '\0';
(void)printf("%p %s %5s %4d %4d",
(void *)avnode, type, flags, vp->v_usecount, vp->v_holdcnt);
(void)printf("%8lx %s %5s %4d %4d",
(u_long)(void *)avnode, type, flags, vp->v_usecount, vp->v_holdcnt);
}
void
@ -593,7 +593,8 @@ union_print(vp)
KGETRET(VTOUNION(vp), &unode, sizeof(unode), "vnode's unode");
(void)printf(" %p %p", (void *)up->un_uppervp, (void *)up->un_lowervp);
(void)printf(" %8lx %8lx", (u_long)(void *)up->un_uppervp,
(u_long)(void *)up->un_lowervp);
return (0);
}
@ -728,7 +729,7 @@ kinfo_vnodes(avnodes)
}
char hdr[] =
" LINE RAW CAN OUT IHWT LWT OHWT LWT COL STATE SESS PGID DISC\n";
" LINE RAW CAN OUT IHIWT ILOWT OHWT LWT COL STATE SESS PGID DISC\n";
int ttyspace = 128;
void
@ -895,7 +896,7 @@ ttyprt(tp, line)
else
(void)printf("%7s ", name);
(void)printf("%2d %3d ", tp->t_rawq.c_cc, tp->t_canq.c_cc);
(void)printf("%3d %4d %3d %4d %3d %7d ", tp->t_outq.c_cc,
(void)printf("%3d %5d %5d %4d %3d %7d ", tp->t_outq.c_cc,
tp->t_ihiwat, tp->t_ilowat, tp->t_ohiwat, tp->t_olowat,
tp->t_column);
for (i = j = 0; ttystates[i].flag; i++)
@ -904,7 +905,7 @@ ttyprt(tp, line)
if (j == 0)
state[j++] = '-';
state[j] = '\0';
(void)printf("%-6s %p", state, (void *)tp->t_session);
(void)printf("%-6s %8lx", state, (u_long)(void *)tp->t_session);
pgid = 0;
if (tp->t_pgrp != NULL)
KGET2(&tp->t_pgrp->pg_id, &pgid, sizeof(pid_t), "pgid");
@ -962,7 +963,7 @@ filemode()
for (; (char *)fp < buf + len; addr = fp->f_list.le_next, fp++) {
if ((unsigned)fp->f_type > DTYPE_SOCKET)
continue;
(void)printf("%p ", (void *)addr);
(void)printf("%8lx ", (u_long)(void *)addr);
(void)printf("%-8.8s", dtypes[fp->f_type]);
fbp = flagbuf;
if (fp->f_flag & FREAD)
@ -982,7 +983,7 @@ filemode()
*fbp = '\0';
(void)printf("%6s %3d", flagbuf, fp->f_count);
(void)printf(" %3d", fp->f_msgcount);
(void)printf(" %8p", (void *)fp->f_data);
(void)printf(" %8lx", (u_long)(void *)fp->f_data);
if (fp->f_offset < 0)
(void)printf(" %qx\n", fp->f_offset);
else