Skip to content

Commit 05a9a21

Browse files
committed
wcslen code dedup
1 parent b6c792e commit 05a9a21

File tree

1 file changed

+13
-15
lines changed

1 file changed

+13
-15
lines changed

wlines.c

+13-15
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,10 @@ wchar_t *getTextboxString(state_t *state)
143143

144144
void filterReduceByStr(state_t *state, const wchar_t *str)
145145
{
146+
if (wcslen(str) == 0) {
147+
return;
148+
}
149+
146150
const size_t c = state->searchResultCount;
147151
state->searchResultCount = 0;
148152
if (state->settings.caseSensitiveSearch) {
@@ -166,14 +170,10 @@ void filterReduceByKeywords(state_t *state, wchar_t *str)
166170
wchar_t *space;
167171
while ((space = StrStrW(str, L" "))) {
168172
space[0] = 0;
169-
if (wcslen(str) > 0) {
170-
filterReduceByStr(state, str);
171-
}
172-
str = space + 1;
173-
}
174-
if (wcslen(str) > 0) {
175173
filterReduceByStr(state, str);
174+
str = space + 1;
176175
}
176+
filterReduceByStr(state, str);
177177
}
178178

179179
void updateSearchResults(state_t *state)
@@ -186,15 +186,13 @@ void updateSearchResults(state_t *state)
186186

187187
// Filter by chosen method
188188
wchar_t *str = getTextboxString(state);
189-
if (wcslen(str) > 0) {
190-
switch (state->settings.filterMode) {
191-
case FM_COMPLETE:
192-
filterReduceByStr(state, str);
193-
break;
194-
case FM_KEYWORDS:
195-
filterReduceByKeywords(state, str);
196-
break;
197-
}
189+
switch (state->settings.filterMode) {
190+
case FM_COMPLETE:
191+
filterReduceByStr(state, str);
192+
break;
193+
case FM_KEYWORDS:
194+
filterReduceByKeywords(state, str);
195+
break;
198196
}
199197

200198
state->selectedResultIndex = state->searchResultCount > 0 ? 0 : SELECTED_INDEX_NO_RESULT;

0 commit comments

Comments
 (0)