[PATCH 02/20] ipmon(): remove baridx variable
There is no point to maintain baridx variable: its two checks can be
transformed to checks of barptr variable against firstvisible or
lastvisible pointers.
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/itrafmon.c | 13 ++-----------
src/tcptable.c | 6 ------
src/tcptable.h | 1 -
3 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/src/itrafmon.c b/src/itrafmon.c
index 458c674..d0385b9 100644
--- a/src/itrafmon.c
+++ b/src/itrafmon.c
@@ -779,10 +779,8 @@ void ipmon(time_t facilitytime, char *ifptr)
printentry(&table, tmptcp, mode);
- if (table.baridx == 1)
+ if (tmptcp == table.firstvisible)
scrollupperwin(&table, SCROLLDOWN, mode);
- else
- (table.baridx)--;
printentry(&table, table.barptr, mode);
break;
@@ -799,10 +797,8 @@ void ipmon(time_t facilitytime, char *ifptr)
table.barptr = table.barptr->next_entry;
printentry(&table, tmptcp, mode);
- if (table.baridx == table.imaxy)
+ if (tmptcp == table.lastvisible)
scrollupperwin(&table, SCROLLUP, mode);
- else
- (table.baridx)++;
printentry(&table,table.barptr, mode);
break;
@@ -837,8 +833,6 @@ void ipmon(time_t facilitytime, char *ifptr)
pageupperwin(&table, SCROLLDOWN);
table.barptr = table.lastvisible;
- table.baridx = table.lastvisible->index
- - table.firstvisible->index + 1;
refreshtcpwin(&table, mode);
break;
case KEY_NPAGE:
@@ -854,7 +848,6 @@ void ipmon(time_t facilitytime, char *ifptr)
pageupperwin(&table, SCROLLUP);
table.barptr = table.firstvisible;
- table.baridx = 1;
refreshtcpwin(&table, mode);
break;
case KEY_F(6):
@@ -913,7 +906,6 @@ void ipmon(time_t facilitytime, char *ifptr)
if (table.barptr != NULL) {
table.barptr = table.firstvisible;
- table.baridx = 1;
}
refreshtcpwin(&table, mode);
del_panel(sortpanel);
@@ -999,7 +991,6 @@ void ipmon(time_t facilitytime, char *ifptr)
if (wasempty) {
table.barptr = table.firstvisible;
- table.baridx = 1;
}
}
}
diff --git a/src/tcptable.c b/src/tcptable.c
index ee26a99..cb6413e 100644
--- a/src/tcptable.c
+++ b/src/tcptable.c
@@ -145,7 +145,6 @@ void init_tcp_table(struct tcptable *table)
table->hash_tails[i] = NULL;
}
table->barptr = NULL;
- table->baridx = 0;
}
/*
@@ -1119,11 +1118,6 @@ void flushclosedentries(struct tcptable *table, int logging, FILE
*logfile)
table->firstvisible = table->firstvisible->prev_entry;
screen_idx--;
}
-
- /*
- * Set the bar position index once everything's done.
- */
- table->baridx = table->barptr->index - screen_idx + 1;
}
}
diff --git a/src/tcptable.h b/src/tcptable.h
index 06a1262..20dadd1 100644
--- a/src/tcptable.h
+++ b/src/tcptable.h
@@ -91,7 +91,6 @@ struct tcptable {
struct tcptableent *firstvisible;
struct tcptableent *lastvisible;
struct tcptableent *barptr;
- unsigned int baridx;
unsigned int lastpos;
unsigned int count;
unsigned int bmaxy; /* number of lines of the border window */
--
1.8.4