From 6b3dbd5c67f5f3a03c712682f603e646afa2f621 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
Date: Tue, 27 Oct 2020 21:26:37 +0100
Subject: Implement IncSet_filter as function

Make it more readable and fix unenclosed macro arguments
---
 IncSet.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'IncSet.h')

diff --git a/IncSet.h b/IncSet.h
index 10b3625c..a6c1974e 100644
--- a/IncSet.h
+++ b/IncSet.h
@@ -21,8 +21,6 @@ typedef enum {
    INC_FILTER = 1
 } IncType;
 
-#define IncSet_filter(inc_) (inc_->filtering ? inc_->modes[INC_FILTER].buffer : NULL)
-
 typedef struct IncMode_ {
    char buffer[INCMODE_MAX+1];
    int index;
@@ -38,6 +36,10 @@ typedef struct IncSet_ {
    bool found;
 } IncSet;
 
+static inline const char* IncSet_filter(const IncSet* this) {
+   return this->filtering ? this->modes[INC_FILTER].buffer : NULL;
+}
+
 typedef const char* (*IncMode_GetPanelValue)(Panel*, int);
 
 void IncSet_reset(IncSet* this, IncType type);
-- 
cgit v1.2.3