1 files changed, 9 insertions, 20 deletions
diff --git a/src/wcstringutil.cpp b/src/wcstringutil.cpp
index e61e331b..9fcb168e 100644
--- a/src/wcstringutil.cpp
+++ b/src/wcstringutil.cpp
@@ -1,26 +1,18 @@
-/** \file wcstringutil.cpp
-
-Helper functions for working with wcstring
-*/
-
-#include "config.h" // IWYU pragma: keep
-
+// Helper functions for working with wcstring.
 #include "wcstringutil.h"
+#include "common.h"
 
 typedef wcstring::size_type size_type;
 
-wcstring_range wcstring_tok(wcstring& str, const wcstring &needle, wcstring_range last)
-{
+wcstring_range wcstring_tok(wcstring& str, const wcstring& needle, wcstring_range last) {
     size_type pos = last.second == wcstring::npos ? wcstring::npos : last.first;
     if (pos != wcstring::npos && last.second != wcstring::npos) pos += last.second;
     if (pos != wcstring::npos && pos != 0) ++pos;
-    if (pos == wcstring::npos || pos >= str.size())
-    {
+    if (pos == wcstring::npos || pos >= str.size()) {
         return std::make_pair(wcstring::npos, wcstring::npos);
     }
 
-    if (needle.empty())
-    {
+    if (needle.empty()) {
         return std::make_pair(pos, wcstring::npos);
     }
 
@@ -28,13 +20,10 @@ wcstring_range wcstring_tok(wcstring& str, const wcstring &needle, wcstring_rang
     if (pos == wcstring::npos) return std::make_pair(wcstring::npos, wcstring::npos);
 
     size_type next_pos = str.find_first_of(needle, pos);
-    if (next_pos == wcstring::npos)
-    {
+    if (next_pos == wcstring::npos) {
         return std::make_pair(pos, wcstring::npos);
     }
-    else
-    {
-        str[next_pos] = L'\0';
-        return std::make_pair(pos, next_pos - pos);
-    }
+
+    str[next_pos] = L'\0';
+    return std::make_pair(pos, next_pos - pos);
 }