From f736a2e8b3addf55f22b7424b987657b9432af29 Mon Sep 17 00:00:00 2001
From: Tindy X <49061470+tindy2013@users.noreply.github.com>
Date: Sat, 21 Mar 2020 17:47:53 +0800
Subject: [PATCH] Fix compiler warnings

Optimize codes.
---
 src/interfaces.cpp  | 2 +-
 src/misc.cpp        | 5 +++--
 src/multithread.cpp | 8 ++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/interfaces.cpp b/src/interfaces.cpp
index 7971cdc..c31ad46 100644
--- a/src/interfaces.cpp
+++ b/src/interfaces.cpp
@@ -344,7 +344,7 @@ void refreshRulesets(string_array &ruleset_list, std::vector<ruleset_content> &r
         {
             writeLog(0, "Adding rule '" + rule_url.substr(2) + "," + rule_group + "'.", LOG_LEVEL_INFO);
             //std::cerr<<"Adding rule '"<<rule_url.substr(2)<<","<<rule_group<<"'."<<std::endl;
-            rc = {rule_group, "", std::move(std::async(std::launch::async, [rule_url](){return rule_url;}))};
+            rc = {rule_group, "", std::async(std::launch::async, [rule_url](){return rule_url;})};
             rca.emplace_back(rc);
             continue;
         }
diff --git a/src/misc.cpp b/src/misc.cpp
index fe10f5d..3d762a1 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -262,9 +262,10 @@ std::string base64_decode(const std::string &encoded_string, bool accept_urlsafe
             dtable[uchar] = k;  // decode (find)
             itable[uchar] = 1;  // is_base64
         }
+        const unsigned char dash = '-', add = '+', under = '_', slash = '/';
         // Add urlsafe table
-        dtable['-'] = dtable['+']; itable['-'] = 2;
-        dtable['_'] = dtable['/']; itable['_'] = 2;
+        dtable[dash] = dtable[add]; itable[dash] = 2;
+        dtable[under] = dtable[slash]; itable[under] = 2;
         table_ready = 1;
     }
 
diff --git a/src/multithread.cpp b/src/multithread.cpp
index 41b3e59..14a71ba 100644
--- a/src/multithread.cpp
+++ b/src/multithread.cpp
@@ -75,11 +75,11 @@ std::shared_future<std::string> fetchFileAsync(const std::string &path, const st
 {
     std::shared_future<std::string> retVal;
     if(fileExist(path))
-        retVal = std::move(std::async(std::launch::async, [path](){return fileGet(path, true);}));
-    else if(startsWith(path, "https://") || startsWith(path, "http://"))
-        retVal = std::move(std::async(std::launch::async, [path, proxy, cache_ttl](){return webGet(path, proxy, cache_ttl);}));
+        retVal = std::async(std::launch::async, [path](){return fileGet(path, true);});
+    else if(startsWith(path, "https://") || startsWith(path, "http://") || startsWith(path, "data:"))
+        retVal = std::async(std::launch::async, [path, proxy, cache_ttl](){return webGet(path, proxy, cache_ttl);});
     else
-        return std::move(std::async(std::launch::async, [](){return std::string();}));
+        return std::async(std::launch::async, [](){return std::string();});
     if(!async)
         retVal.wait();
     return retVal;