From c352c7a1011a2afcfcfda61ec5be03e6f9dc2024 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Sat, 27 Mar 2004 04:30:31 +0000 Subject: clean --- ifstat.c | 9 ++++++--- output.c | 30 ------------------------------ 2 files changed, 6 insertions(+), 33 deletions(-) diff --git a/ifstat.c b/ifstat.c index 73d12a7..763124b 100644 --- a/ifstat.c +++ b/ifstat.c @@ -44,11 +44,13 @@ int if_init(char *ifname) { if ((kvm_nlist(kvmd, nl)) == -1) error(kvm_geterr(kvmd)); - if (kvm_read(kvmd, nl->n_value, &ifhead, sizeof(nl->n_value)) != sizeof(nl->n_value)) + if (kvm_read(kvmd, nl->n_value, &ifhead, sizeof(nl->n_value)) + != sizeof(nl->n_value)) error(kvm_geterr(kvmd)); for (; ifhead != NULL; ifhead = (struct ifnet *)ifnet.if_list.tqe_next) { - if (kvm_read(kvmd, (unsigned long)ifhead, &ifnet, sizeof(ifnet)) != sizeof(ifnet)) + if (kvm_read(kvmd, (unsigned long)ifhead, &ifnet, sizeof(ifnet)) + != sizeof(ifnet)) error(kvm_geterr(kvmd)); if (strncmp(ifnet.if_xname, ifname, strlen(ifname)) == NULL) addr = ifhead; @@ -62,7 +64,8 @@ int if_stat(void) { struct ifnet ifnet; extern struct ifdata ifdata; - if (kvm_read(kvmd, (unsigned long)addr, &ifnet, sizeof(ifnet)) != sizeof(ifnet)) + if (kvm_read(kvmd, (unsigned long)addr, &ifnet, sizeof(ifnet)) + != sizeof(ifnet)) error(kvm_geterr(kvmd)); strlcpy(ifdata.xname ,ifnet.if_xname, sizeof(ifdata.xname)); diff --git a/output.c b/output.c index 971a096..8b79dd5 100644 --- a/output.c +++ b/output.c @@ -37,36 +37,6 @@ int out(struct ifdata *diff) { WINDOW *scr; move(0,0); -/* - mvprintw(YPOS, XPOS, - "IF: %s\n", ifdata.xname); - mvprintw(YPOS, XPOS + 25, - "BR: %d Mbps\n", ifdata.baudrate / 1000000); - mvprintw(YPOS + 2, XPOS, - "RX: %3lu kBps\n", diff->ibytes / 1024); - mvprintw(YPOS + 3, XPOS, - "RA: %3i kBps\n", delta(diff->ibytes, ani) / 1024); - - mvprintw(YPOS + 2, XPOS + 25, - "TX: %3lu kBps\n", diff->obytes / 1024); - mvprintw(YPOS + 3, XPOS + 25, - "TA: %3i kBps\n", delta(diff->obytes, ano) / 1024); - - mvprintw(YPOS + 5, XPOS, - "RX: %3lu pps\n", diff->ipackets); - mvprintw(YPOS + 6, XPOS, - "RA: %3lu pps\n", delta(diff->ipackets, api)); - - mvprintw(YPOS + 5, XPOS + 25, - "TX: %3lu pps\n", diff->opackets); - mvprintw(YPOS + 6, XPOS + 25, - "TA: %3lu pps\n", delta(diff->opackets, apo)); - - mvprintw(YPOS + 8, XPOS, - "RX: %lu MB\n", ifdata.ibytes / (1024 * 1024)); - mvprintw(YPOS + 8, XPOS + 25, - "TX: %lu MB\n", ifdata.obytes / (1024 * 1024)); -*/ dli = delta(diff->ibytes, ani); dlo = delta(diff->obytes, ano); -- cgit v1.2.3