From 7386c6fed03737be11f93a10fcc66296f97c7920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= Date: Tue, 5 Jan 2021 23:01:30 +0100 Subject: Avoid function cast by refactoring callback prototype --- MainPanel.c | 12 ++++++------ MainPanel.h | 2 -- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/MainPanel.c b/MainPanel.c index 3e7a812d..859c5130 100644 --- a/MainPanel.c +++ b/MainPanel.c @@ -44,6 +44,11 @@ void MainPanel_pidSearch(MainPanel* this, int ch) { } } +static const char* MainPanel_getValue(Panel* this, int i) { + const Process* p = (const Process*) Panel_get(this, i); + return Process_getCommand(p); +} + static HandlerResult MainPanel_eventHandler(Panel* super, int ch) { MainPanel* this = (MainPanel*) super; @@ -77,7 +82,7 @@ static HandlerResult MainPanel_eventHandler(Panel* super, int ch) { reaction |= HTOP_RECALCULATE | HTOP_REDRAW_BAR | HTOP_SAVE_SETTINGS; result = HANDLED; } else if (ch != ERR && this->inc->active) { - bool filterChanged = IncSet_handleKey(this->inc, ch, super, (IncMode_GetPanelValue) MainPanel_getValue, NULL); + bool filterChanged = IncSet_handleKey(this->inc, ch, super, MainPanel_getValue, NULL); if (filterChanged) { this->state->pl->incFilter = IncSet_filter(this->inc); reaction = HTOP_REFRESH | HTOP_REDRAW_BAR; @@ -136,11 +141,6 @@ int MainPanel_selectedPid(MainPanel* this) { return -1; } -const char* MainPanel_getValue(MainPanel* this, int i) { - Process* p = (Process*) Panel_get((Panel*)this, i); - return Process_getCommand(p); -} - bool MainPanel_foreachProcess(MainPanel* this, MainPanel_ForeachProcessFn fn, Arg arg, bool* wasAnyTagged) { Panel* super = (Panel*) this; bool ok = true; diff --git a/MainPanel.h b/MainPanel.h index 03a1affd..2427ca32 100644 --- a/MainPanel.h +++ b/MainPanel.h @@ -38,8 +38,6 @@ void MainPanel_pidSearch(MainPanel* this, int ch); int MainPanel_selectedPid(MainPanel* this); -const char* MainPanel_getValue(MainPanel* this, int i); - bool MainPanel_foreachProcess(MainPanel* this, MainPanel_ForeachProcessFn fn, Arg arg, bool* wasAnyTagged); extern const PanelClass MainPanel_class; -- cgit v1.2.3