summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2007-07-05 11:27:56 +0000
committerDimitri Sokolyuk <demon@dim13.org>2007-07-05 11:27:56 +0000
commit4de796918d5af2bfda9e048fe854b816a64cf3bd (patch)
tree7ecf4176cad71acda7b12b5966abe726debefb4d
parent7db1972665fbb9671016f16cc079920a8d80eac4 (diff)
improve readability
-rw-r--r--netmet2.c42
1 files changed, 17 insertions, 25 deletions
diff --git a/netmet2.c b/netmet2.c
index 796d5a5..df3aa35 100644
--- a/netmet2.c
+++ b/netmet2.c
@@ -57,7 +57,7 @@ void display2(void);
void updatedata(int, int);
int findif(int, int, char **);
int readdata(int, char *, void *);
-void unit(WINDOW *, int);
+void mvwprintw2(WINDOW *, int, int, char *, int);
__dead void usage(void);
int
@@ -155,26 +155,28 @@ initscreen(int n)
}
void
+mvwprintw2(WINDOW *w, int a, int b, char *c, int n)
+{
+ int i;
+
+ mvwprintw(w, a, b, "%s", c);
+ for (i = 0; n > 1<<10; ++i, n >>= 10)
+ ;
+ wprintw(w, "%4d %cBps", n, " KMG"[i]);
+}
+
+
+void
display2(void)
{
int i, lenin, lenout, pos;
int symin, symout;
SIMPLEQ_FOREACH(datap, &head, link) {
- /*
- mvwprintw(datap->info, 0, 0, "in: %8d", (*datap->cur)[0]);
- mvwprintw(datap->info, 1, 0, "imax: %8d", datap->max[0]);
- mvwprintw(datap->info, 2, 0, "out: %8d", (*datap->cur)[1]);
- mvwprintw(datap->info, 3, 0, "omax: %8d", datap->max[1]);
- */
- mvwprintw(datap->info, 0, 0, "in: ");
- unit(datap->info, (*datap->cur)[0]);
- mvwprintw(datap->info, 1, 0, "imax:");
- unit(datap->info, datap->max[0]);
- mvwprintw(datap->info, 2, 0, "out: ");
- unit(datap->info, (*datap->cur)[1]);
- mvwprintw(datap->info, 3, 0, "omax:");
- unit(datap->info, datap->max[1]);
+ mvwprintw2(datap->info, 0, 0, "in: ", (*datap->cur)[0]);
+ mvwprintw2(datap->info, 1, 0, "imax:", datap->max[0]);
+ mvwprintw2(datap->info, 2, 0, "out: ", (*datap->cur)[1]);
+ mvwprintw2(datap->info, 3, 0, "omax:", datap->max[1]);
wnoutrefresh(datap->info);
symin = hascolors ? ' ' : '+';
@@ -299,16 +301,6 @@ readdata(int sock, char *name, void *data)
return ioctl(sock, SIOCGIFDATA, (caddr_t)&ifr);
}
-void
-unit(WINDOW *w, int n)
-{
- int i;
-
- for (i = 0; n > 1<<10; ++i, n >>= 10)
- ;
- wprintw(w, "%4d %cBps", n, " KMG"[i]);
-}
-
__dead void
usage(void)
{