... and fix all the calling sites.
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/fltmgr.c | 3 +--
src/ifstats.c | 4 +---
src/landesc.c | 3 +--
src/serv.c | 3 +--
src/tui/listbox.c | 3 +--
src/tui/listbox.h | 2 +-
6 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/src/fltmgr.c b/src/fltmgr.c
index ad194ee..370194c 100644
--- a/src/fltmgr.c
+++ b/src/fltmgr.c
@@ -228,7 +228,6 @@ void save_filterlist(struct ffnode *fltlist)
void operate_select(struct ffnode *ffiles, struct ffnode **item, int *aborted)
{
struct ffnode *pptr;
- int ch;
struct scroll_list list;
tx_listkeyhelp(STDATTR, HIGHATTR);
@@ -249,7 +248,7 @@ void operate_select(struct ffnode *ffiles, struct ffnode **item, int
*aborted)
}
tx_show_listbox(&list);
- tx_operate_listbox(&list, &ch, aborted);
+ tx_operate_listbox(&list, aborted);
if (!(*aborted))
*item = (struct ffnode *) list.textptr->nodeptr;
diff --git a/src/ifstats.c b/src/ifstats.c
index 3098868..8e15979 100644
--- a/src/ifstats.c
+++ b/src/ifstats.c
@@ -636,8 +636,6 @@ err:
void selectiface(char *ifname, int withall, int *aborted)
{
- int ch;
-
struct iflist *list;
struct iflist *ptmp;
@@ -678,7 +676,7 @@ void selectiface(char *ifname, int withall, int *aborted)
}
tx_show_listbox(&scrolllist);
- tx_operate_listbox(&scrolllist, &ch, aborted);
+ tx_operate_listbox(&scrolllist, aborted);
tx_close_listbox(&scrolllist);
if (!(*aborted) && (list != NULL)) {
diff --git a/src/landesc.c b/src/landesc.c
index 1f48137..d51c094 100644
--- a/src/landesc.c
+++ b/src/landesc.c
@@ -195,7 +195,6 @@ void free_eth_desc(struct eth_desc *hd)
static struct eth_desc *select_eth_desc(const struct eth_desc *hd)
{
- int resp;
struct scroll_list slist;
char descline[80];
@@ -222,7 +221,7 @@ static struct eth_desc *select_eth_desc(const struct eth_desc *hd)
int aborted = 0;
- tx_operate_listbox(&slist, &resp, &aborted);
+ tx_operate_listbox(&slist, &aborted);
if (!aborted)
entry = (struct eth_desc *) slist.textptr->nodeptr;
diff --git a/src/serv.c b/src/serv.c
index 34421b3..c82bd3a 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -1272,7 +1272,6 @@ void loadaddports(struct porttab **table)
static void operate_portselect(struct porttab **table, struct porttab **node,
int *aborted)
{
- int ch = 0;
struct scroll_list list;
char listtext[20];
@@ -1290,7 +1289,7 @@ static void operate_portselect(struct porttab **table, struct
porttab **node,
}
tx_show_listbox(&list);
- tx_operate_listbox(&list, &ch, aborted);
+ tx_operate_listbox(&list, aborted);
if (!(*aborted))
*node = (struct porttab *) list.textptr->nodeptr;
diff --git a/src/tui/listbox.c b/src/tui/listbox.c
index ce8d5bf..21b6cb1 100644
--- a/src/tui/listbox.c
+++ b/src/tui/listbox.c
@@ -78,7 +78,7 @@ void tx_show_listbox(struct scroll_list *list)
doupdate();
}
-void tx_operate_listbox(struct scroll_list *list, int *keystroke, int *aborted)
+void tx_operate_listbox(struct scroll_list *list, int *aborted)
{
int ch;
int endloop = 0;
@@ -154,7 +154,6 @@ void tx_operate_listbox(struct scroll_list *list, int *keystroke, int
*aborted)
break;
}
}
- *keystroke = ch;
}
void tx_hide_listbox(struct scroll_list *list)
diff --git a/src/tui/listbox.h b/src/tui/listbox.h
index 75637ff..5fa60c0 100644
--- a/src/tui/listbox.h
+++ b/src/tui/listbox.h
@@ -36,7 +36,7 @@ void tx_init_listbox(struct scroll_list *list, int width, int height,
void tx_set_listbox_title(struct scroll_list *list, char *text, int x);
void tx_add_list_entry(struct scroll_list *list, char *node, char *text);
void tx_show_listbox(struct scroll_list *list);
-void tx_operate_listbox(struct scroll_list *list, int *keystroke, int *aborted);
+void tx_operate_listbox(struct scroll_list *list, int *aborted);
void tx_hide_listbox(struct scroll_list *list);
void tx_unhide_listbox(struct scroll_list *list);
void tx_close_listbox(struct scroll_list *list);
--
1.7.8.4