From 42f47e483da19079a937c4801ca94bd62d8dc970 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 21 Aug 2017 22:44:29 +0300
Subject: Remove useless else.

---
 src/utils/stringutils.cpp | 48 +++++++++++++++--------------------------------
 1 file changed, 15 insertions(+), 33 deletions(-)

(limited to 'src/utils/stringutils.cpp')

diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp
index 8920d111b..ecbd7de19 100644
--- a/src/utils/stringutils.cpp
+++ b/src/utils/stringutils.cpp
@@ -560,10 +560,7 @@ std::string combineDye2(std::string file,
         }
         return file.append("|").append(str);
     }
-    else
-    {
-        return file;
-    }
+    return file;
 }
 
 std::string combineDye3(std::string file,
@@ -588,13 +585,9 @@ std::string combineDye3(std::string file,
         }
         return file.append("|").append(str);
     }
-    else
-    {
-        if (dye.empty() || file.empty())
-            return file;
-        else
-            return file.append("|").append(dye);
-    }
+    if (dye.empty() || file.empty())
+        return file;
+    return file.append("|").append(dye);
 }
 
 std::string packList(const std::list<std::string> &list)
@@ -959,8 +952,7 @@ std::string timeToStr(const uint32_t time)
     tm *const timeInfo = localtime(&tempTime);
     if (strftime(&buf[0], 100, "%Y-%m-%d_%H-%M-%S", timeInfo) != 0u)
         return std::string(buf);
-    else
-        return "unknown";
+    return "unknown";
 }
 
 std::string timeDiffToString(int timeDiff)
@@ -1060,30 +1052,26 @@ std::string pathJoin(std::string str1,
     {
         if (str2[0] == sep)
             return str2;
-        else
-            return sepStr.append(str2);
+        return sepStr.append(str2);
     }
     const size_t sz1 = str1.size();
     if (str2.empty())
     {
         if (str1[sz1 - 1] == sep)
             return str1;
-        else
-            return str1.append(sepStr);
+        return str1.append(sepStr);
     }
     if (str1[sz1 - 1] == sep)
     {
         if (str2[0] == sep)
             return str1.append(str2.substr(1));
-        else
-            return str1.append(str2);
+        return str1.append(str2);
     }
     else
     {
         if (str2[0] == sep)
             return str1.append(str2);
-        else
-            return str1.append(sepStr).append(str2);
+        return str1.append(sepStr).append(str2);
     }
 }
 
@@ -1132,15 +1120,13 @@ std::string pathJoin(std::string str1,
     {
         if (str3[0] == sep)
             return str1.append(str3.substr(1));
-        else
-            return str1.append(str3);
+        return str1.append(str3);
     }
     else
     {
         if (str3[0] == sep)
             return str1.append(str3);
-        else
-            return str1.append(sepStr).append(str3);
+        return str1.append(sepStr).append(str3);
     }
 }
 
@@ -1154,30 +1140,26 @@ std::string urlJoin(std::string str1,
     {
         if (str2[0] == sep)
             return str2;
-        else
-            return sepStr.append(str2);
+        return sepStr.append(str2);
     }
     const size_t sz1 = str1.size();
     if (str2.empty())
     {
         if (str1[sz1 - 1] == sep)
             return str1;
-        else
-            return str1.append(sepStr);
+        return str1.append(sepStr);
     }
     if (str1[sz1 - 1] == sep)
     {
         if (str2[0] == sep)
             return str1.append(str2.substr(1));
-        else
-            return str1.append(str2);
+        return str1.append(str2);
     }
     else
     {
         if (str2[0] == sep)
             return str1.append(str2);
-        else
-            return str1.append(sepStr).append(str2);
+        return str1.append(sepStr).append(str2);
     }
 }
 
-- 
cgit v1.2.3-60-g2f50