remoed ternary expressions

Author: Pmaxsd

main/http_server/v2/handler_v2_dashboard.cpp

@@ -144,9 +144,9 @@ esp_err_t GET_V2_dashboard(httpd_req_t *req)
         JsonArray pools = stratum["pools"].as<JsonArray>();
         for (int i = 0; i < (int) pools.size() && i < 2; i++) {
             JsonObject pool = pools[i].as<JsonObject>();
-            pool["host"] = urls[i]  ? urls[i]  : "";
+            pool["host"] = urls[i];
             pool["port"] = ports[i];
-            pool["user"] = users[i] ? users[i] : "";
+            pool["user"] = users[i];
         }
 
         for (int i = 0; i < 2; i++) {

main/http_server/v2/handler_v2_settings.cpp

@@ -83,14 +83,14 @@ esp_err_t GET_V2_settings(httpd_req_t *req)
             JsonObject pool = pools.add<JsonObject>();
             char *url  = Config::getStratumURL();
             char *user = Config::getStratumUser();
-            pool["url"]              = url  ? url  : "";
+            pool["url"]              = url; 
             pool["port"]             = Config::getStratumPortNumber();
-            pool["user"]             = user ? user : "";
+            pool["user"]             = user;
             pool["enonceSubscribe"]  = Config::isStratumEnonceSubscribe();
             pool["tls"]              = Config::isStratumTLS();
             pool["protocol"]         = Config::getStratumProtocol();
             char *sv2 = Config::getSV2AuthorityPubkey();
-            pool["sv2AuthorityPubkey"] = sv2 ? sv2 : "";
+            pool["sv2AuthorityPubkey"] = sv2;
             safe_free(sv2);
             pool["sv2ChannelType"]   = Config::getSV2ChannelType();
             pool["coinbaseVerifyMode"]  = Config::getCoinbaseVerifyMode(0);
@@ -105,14 +105,14 @@ esp_err_t GET_V2_settings(httpd_req_t *req)
             JsonObject pool = pools.add<JsonObject>();
             char *url  = Config::getStratumFallbackURL();
             char *user = Config::getStratumFallbackUser();
-            pool["url"]              = url  ? url  : "";
+            pool["url"]              = url;
             pool["port"]             = Config::getStratumFallbackPortNumber();
-            pool["user"]             = user ? user : "";
+            pool["user"]             = user;
             pool["enonceSubscribe"]  = Config::isStratumFallbackEnonceSubscribe();
             pool["tls"]              = Config::isStratumFallbackTLS();
             pool["protocol"]         = Config::getFallbackStratumProtocol();
             char *sv2 = Config::getFallbackSV2AuthorityPubkey();
-            pool["sv2AuthorityPubkey"] = sv2 ? sv2 : "";
+            pool["sv2AuthorityPubkey"] = sv2;
             safe_free(sv2);
             pool["sv2ChannelType"]   = Config::getFallbackSV2ChannelType();
             pool["coinbaseVerifyMode"]  = Config::getCoinbaseVerifyMode(1);
@@ -150,8 +150,8 @@ esp_err_t GET_V2_settings(httpd_req_t *req)
     {
         char *hostname = Config::getHostname();
         char *ssid     = Config::getWifiSSID();
-        doc["hostname"] = hostname ? hostname : "";
-        doc["ssid"]     = ssid     ? ssid     : "";
+        doc["hostname"] = hostname;
+        doc["ssid"]     = ssid;
         free(hostname);
         free(ssid);
     }
@@ -160,7 +160,7 @@ esp_err_t GET_V2_settings(httpd_req_t *req)
     {
         doc["mempoolCustom"] = Config::isMempoolCustom();
         char *mempoolUrl = Config::getMempoolUrl();
-        doc["mempoolUrl"] = mempoolUrl ? mempoolUrl : "";
+        doc["mempoolUrl"] = mempoolUrl;
         free(mempoolUrl);
     }