From 45e6fafc4708b10314be3399814c0f07d4ab8e1c Mon Sep 17 00:00:00 2001
From: sin <sin@2f30.org>
Date: Mon, 22 Aug 2016 14:10:14 +0100
Subject: [PATCH] Split out default filter initialization
---
noice.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/noice.c b/noice.c
index 0d5627df..2dc895da 100644
--- a/noice.c
+++ b/noice.c
@@ -238,6 +238,12 @@ setfilter(regex_t *regex, char *filter)
return r;
}
+void
+initfilter(int dot, char **ifilter)
+{
+ *ifilter = dot ? "." : "^[^.]";
+}
+
int
visible(regex_t *regex, char *file)
{
@@ -734,7 +740,7 @@ nochange:
goto begin;
case SEL_TOGGLEDOT:
showhidden ^= 1;
- ifilter = showhidden ? "." : "^[^.]";
+ initfilter(showhidden, &ifilter);
strlcpy(fltr, ifilter, sizeof(fltr));
goto begin;
case SEL_MTIME:
@@ -795,11 +801,7 @@ main(int argc, char *argv[])
if (getuid() == 0)
showhidden = 1;
-
- if (showhidden)
- ifilter = ".";
- else
- ifilter = "^[^.]";
+ initfilter(showhidden, &ifilter);
if (argv[1] != NULL) {
ipath = argv[1];
--
2.51.0