Fix clang warnings on some utils function. It’s also faster

2 files changed, 5 insertions, 11 deletions

diff --git a/src/utils/empty_if_fixed_server.hpp b/src/utils/empty_if_fixed_server.hpp
index cbb9cea..2422ee4 100644
--- a/src/utils/empty_if_fixed_server.hpp
+++ b/src/utils/empty_if_fixed_server.hpp
@@ -7,17 +7,11 @@
 
 namespace utils
 {
-  inline std::string empty_if_fixed_server(std::string&& str)
+  inline const std::string& empty_if_fixed_server(const std::string& str)
   {
+    static const std::string empty{};
     if (!Config::get("fixed_irc_server", "").empty())
-      return {};
-    return std::move(str);
-  }
-
-  inline std::string empty_if_fixed_server(const std::string& str)
-  {
-    if (!Config::get("fixed_irc_server", "").empty())
-      return {};
+      return empty;
     return str;
   }
 
diff --git a/src/utils/get_first_non_empty.hpp b/src/utils/get_first_non_empty.hpp
index 1877ee8..6129b63 100644
--- a/src/utils/get_first_non_empty.hpp
+++ b/src/utils/get_first_non_empty.hpp
@@ -11,13 +11,13 @@ template <>
 bool is_empty(const std::string& val);
 
 template <typename T>
-T get_first_non_empty(T&& last)
+T& get_first_non_empty(T&& last)
 {
   return last;
 }
 
 template <typename T, typename... Args>
-T get_first_non_empty(T&& first, Args&&... args)
+T& get_first_non_empty(T&& first, Args&&... args)
 {
   if (!is_empty(first))
     return first;