diff options
| author | ed <ed@FreeBSD.org> | 2009-06-11 09:02:22 +0000 |
|---|---|---|
| committer | ed <ed@FreeBSD.org> | 2009-06-11 09:02:22 +0000 |
| commit | 3f57ef9c14686faaba8d18593186246e08ad3e59 (patch) | |
| tree | 8471c640c4ee2b841e75a7254e8bdfbf288bce86 /usr.sbin/pstat/pstat.c | |
| parent | 17835ecb128ab194297d4372d0315a7fa2a27ef3 (diff) | |
| download | FreeBSD-src-3f57ef9c14686faaba8d18593186246e08ad3e59.zip FreeBSD-src-3f57ef9c14686faaba8d18593186246e08ad3e59.tar.gz | |
Make most of pstat(8) build with WARNS=6.
There is still an issue with the nlists, which I'm not quite sure how to
solve, so I'm leaving WARNS set to 3 right now.
Diffstat (limited to 'usr.sbin/pstat/pstat.c')
| -rw-r--r-- | usr.sbin/pstat/pstat.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c index 8272eee..f383968 100644 --- a/usr.sbin/pstat/pstat.c +++ b/usr.sbin/pstat/pstat.c @@ -95,7 +95,7 @@ static char *nlistf; static char *memf; static kvm_t *kd; -static char *usagestr; +static const char *usagestr; static void filemode(void); static int getfiles(char **, size_t *); @@ -109,7 +109,8 @@ main(int argc, char *argv[]) { int ch, i, quit, ret; int fileflag, ttyflag; - char buf[_POSIX2_LINE_MAX],*opts; + char buf[_POSIX2_LINE_MAX]; + const char *opts; fileflag = swapflag = ttyflag = 0; @@ -358,8 +359,8 @@ filemode(void) char *buf, flagbuf[16], *fbp; int maxf, openf; size_t len; - static char *dtypes[] = { "???", "inode", "socket", "pipe", - "fifo", "kqueue", "crypto" }; + static const char *dtypes[] = { "???", "inode", "socket", + "pipe", "fifo", "kqueue", "crypto" }; int i; int wid; @@ -466,7 +467,7 @@ print_swap_header(void) } static void -print_swap_line(const char *devname, intmax_t nblks, intmax_t bused, +print_swap_line(const char *swdevname, intmax_t nblks, intmax_t bused, intmax_t bavail, float bpercent) { char usedbuf[5]; @@ -477,7 +478,7 @@ print_swap_line(const char *devname, intmax_t nblks, intmax_t bused, pagesize = getpagesize(); getbsize(&hlen, &blocksize); - printf("%-15s %*jd ", devname, hlen, CONVERT(nblks)); + printf("%-15s %*jd ", swdevname, hlen, CONVERT(nblks)); if (humanflag) { humanize_number(usedbuf, sizeof(usedbuf), CONVERT(blocksize * bused), "", |
