diff options
| -rw-r--r-- | usr.bin/systat/iostat.c | 16 | ||||
| -rw-r--r-- | usr.bin/systat/mbufs.c | 4 | ||||
| -rw-r--r-- | usr.bin/systat/netstat.c | 2 | ||||
| -rw-r--r-- | usr.bin/systat/pigs.c | 4 |
4 files changed, 13 insertions, 13 deletions
diff --git a/usr.bin/systat/iostat.c b/usr.bin/systat/iostat.c index b499a8b21046..edeab4b99fb6 100644 --- a/usr.bin/systat/iostat.c +++ b/usr.bin/systat/iostat.c @@ -214,7 +214,7 @@ numlabels(row) char tmpstr[10]; #define COLWIDTH 17 -#define DRIVESPERLINE ((wnd->maxx - INSET) / COLWIDTH) +#define DRIVESPERLINE ((wnd->_maxx - INSET) / COLWIDTH) for (ndrives = 0, i = 0; i < num_devices; i++) if (dev_select[i].selected) ndrives++; @@ -222,7 +222,7 @@ numlabels(row) /* * Deduct -regions for blank line after each scrolling region. */ - linesperregion = (wnd->maxy - row - regions) / regions; + linesperregion = (wnd->_maxy - row - regions) / regions; /* * Minimum region contains space for two * label lines and one line of statistics. @@ -232,9 +232,9 @@ numlabels(row) col = INSET; for (i = 0; i < num_devices; i++) if (dev_select[i].selected) { - if (col + COLWIDTH >= wnd->maxx - INSET) { + if (col + COLWIDTH >= wnd->_maxx - INSET) { col = INSET, row += linesperregion + 1; - if (row > wnd->maxy - (linesperregion + 1)) + if (row > wnd->_maxy - (linesperregion + 1)) break; } sprintf(tmpstr, "%s%d", dev_select[i].device_name, @@ -260,7 +260,7 @@ barlabels(row) linesperregion = 2 + kbpt; for (i = 0; i < num_devices; i++) if (dev_select[i].selected) { - if (row > wnd->maxy - linesperregion) + if (row > wnd->_maxy - linesperregion) break; sprintf(tmpstr, "%s%d", dev_select[i].device_name, dev_select[i].unit_number); @@ -296,7 +296,7 @@ showiostat() row += 2; for (i = 0; i < num_devices; i++) if (dev_select[i].selected) { - if (row > wnd->maxy - linesperregion) + if (row > wnd->_maxy - linesperregion) break; row = devstats(row, INSET, i); } @@ -309,9 +309,9 @@ showiostat() winsertln(wnd); for (i = 0; i < num_devices; i++) if (dev_select[i].selected) { - if (col + COLWIDTH >= wnd->maxx - INSET) { + if (col + COLWIDTH >= wnd->_maxx - INSET) { col = INSET, row += linesperregion + 1; - if (row > wnd->maxy - (linesperregion + 1)) + if (row > wnd->_maxy - (linesperregion + 1)) break; wmove(wnd, row + linesperregion, 0); wdeleteln(wnd); diff --git a/usr.bin/systat/mbufs.c b/usr.bin/systat/mbufs.c index f542da99e727..5e428618cf0f 100644 --- a/usr.bin/systat/mbufs.c +++ b/usr.bin/systat/mbufs.c @@ -103,9 +103,9 @@ showmbufs() if (mb == 0) return; - for (j = 0; j < wnd->maxy; j++) { + for (j = 0; j < wnd->_maxy; j++) { max = 0, index = -1; - for (i = 0; i < wnd->maxy; i++) { + for (i = 0; i < wnd->_maxy; i++) { if (i == MT_FREE) continue; if (mb->m_mtypes[i] > max) { diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c index ba53fdae58ab..305c1339f1fe 100644 --- a/usr.bin/systat/netstat.c +++ b/usr.bin/systat/netstat.c @@ -81,7 +81,7 @@ static char *inetname __P((struct in_addr)); static void inetprint __P((struct in_addr *, int, char *)); #define streq(a,b) (strcmp(a,b)==0) -#define YMAX(w) ((w)->maxy-1) +#define YMAX(w) ((w)->_maxy-1) WINDOW * opennetstat() diff --git a/usr.bin/systat/pigs.c b/usr.bin/systat/pigs.c index 8af36c84ad74..ba9b60a87eed 100644 --- a/usr.bin/systat/pigs.c +++ b/usr.bin/systat/pigs.c @@ -110,8 +110,8 @@ showpigs() qsort(pt, nproc + 1, sizeof (struct p_times), compar); y = 1; i = nproc + 1; - if (i > wnd->maxy-1) - i = wnd->maxy-1; + if (i > wnd->_maxy-1) + i = wnd->_maxy-1; for (k = 0; i > 0 && pt[k].pt_pctcpu > 0.01; i--, y++, k++) { if (pt[k].pt_kp == NULL) { uname = ""; |