aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorEd Schouten <ed@FreeBSD.org>2009-06-11 09:02:22 +0000
committerEd Schouten <ed@FreeBSD.org>2009-06-11 09:02:22 +0000
commit777e045cb5d49dde42f3506b58dd109e26efca03 (patch)
tree8471c640c4ee2b841e75a7254e8bdfbf288bce86 /usr.sbin
parentbe5d11dcb097571db64903b38f182897c2c55442 (diff)
downloadsrc-777e045cb5d49dde42f3506b58dd109e26efca03.tar.gz
src-777e045cb5d49dde42f3506b58dd109e26efca03.zip
Notes
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/pstat/pstat.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c
index 8272eee38bd6..f383968a2811 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), "",