Fix the Toolchain(GCC-9)

Change-Id: I0ec2aca74e76cae6b4239baacce1a10c4c155a4a
Signed-off-by: cookie <cookie@samsung.com>

diff --git a/core/BrowserLogger.h b/core/BrowserLogger.h
index 11dd99acb7193763072fa13b4a98a861218c4571..7e4f200a0440bc548ea94202f12e65fed36aae30 100755 (executable)
--- a/core/BrowserLogger.h
+++ b/core/BrowserLogger.h
@@ -20,7 +20,7 @@
 #include "browser_config.h"
 #include <string>
 
-#if !defined(NDEBUG) || PLATFORM(TIZEN)
+#ifdef NDEBUG
 
 #include "Logger/Logger.h"
 

diff --git a/core/Logger/Logger.cpp b/core/Logger/Logger.cpp
index 96c1e9b91e750ff8232ac008c64bdbb6e1151efb..6f3c423bd71340be905b1013413d60bf62094bdd 100755 (executable)
--- a/core/Logger/Logger.cpp
+++ b/core/Logger/Logger.cpp
@@ -157,6 +157,7 @@ int Logger::registerLogger(AbstractLogger *l) {
 std::string Logger::timeStamp() {
         struct tm b;
         struct timeval detail_time;
+               memset(&b, 0, sizeof(b));
         gettimeofday(&detail_time, NULL);
 
         char buf[80];

diff --git a/core/Logger/LoggerTools.cpp b/core/Logger/LoggerTools.cpp
index 3d6e26903ff936658fadb01e9091417e0d30a73e..128352a290a3e3937b07f5433f1d9758abd2a88a 100755 (executable)
--- a/core/Logger/LoggerTools.cpp
+++ b/core/Logger/LoggerTools.cpp
@@ -34,7 +34,7 @@ std::string make_message(const char *fmt, ...)
 
        try {
                p = new char[size];
-       } catch (std::bad_alloc) {
+       } catch (const std::bad_alloc& e) {
                Logger::getInstance().log("Error while allocating memory!!");
                return std::string();
        }
@@ -66,7 +66,7 @@ std::string make_message(const char *fmt, ...)
                        std::copy(p, p + old_size, np);
                        delete [] p;
                        p = np;
-               } catch (std::bad_alloc) {
+               } catch (const std::bad_alloc& e) {
                        delete [] p;
                        Logger::getInstance().log("Error while allocating memory!!");
                        return std::string();

diff --git a/services/WebEngineMin/WebEngineMin.cpp b/services/WebEngineMin/WebEngineMin.cpp
index d2e5df2b6940b47864a39f46b22835547f75df5f..071ea1dd3667c9dda5d115928491fa628259d2b5 100755 (executable)
--- a/services/WebEngineMin/WebEngineMin.cpp
+++ b/services/WebEngineMin/WebEngineMin.cpp
@@ -75,7 +75,8 @@ void WebEngineMin::_push_cb(const char *sender_id, const char* push_data, void*
 void WebEngineMin::_register_service_worker_result_cb(
     Ewk_Context*, const char* scope_url, const char* script_url, Eina_Bool result, void*)
 {
-    BROWSER_LOGD("[PWE-SHUB][%s:%d] scope_url: %s, script_url: %s, result: %s",
+    if(scope_url||script_url||result)
+        BROWSER_LOGD("[PWE-SHUB][%s:%d] scope_url: %s, script_url: %s, result: %s",
                  __PRETTY_FUNCTION__, __LINE__, scope_url, script_url, result ? "true" : "false");
 }
 #endif

diff --git a/services/WebEngineService/WebEngineService.cpp b/services/WebEngineService/WebEngineService.cpp
index 3d6036638e0f40adf0053c84eb6e72ef3889a70c..3cbe691bfca87ad762f8f734147f87ec44c74ec0 100755 (executable)
--- a/services/WebEngineService/WebEngineService.cpp
+++ b/services/WebEngineService/WebEngineService.cpp
@@ -580,10 +580,10 @@ TabId WebEngineService::addTab(
             if (newAdaptorId < 0)
                 return TabId(TabId::NONE);
         }
-        newTabId = TabId(newAdaptorId);
+        newTabId == TabId(newAdaptorId);
     } else {
         ++m_tabIdSecret;
-        newTabId = TabId(m_tabIdSecret);
+        newTabId == TabId(m_tabIdSecret);
     }
 
     if (!m_webViewCacheInitialized) {
@@ -643,7 +643,7 @@ bool WebEngineService::switchToTab(tizen_browser::basic_webengine::TabId newTabI
 
         closeFindOnPage();
         m_currentWebView = m_stateStruct->tabs[newTabId];
-        m_stateStruct->currentTabId = newTabId;
+        m_stateStruct->currentTabId == newTabId;
         m_stateStruct->mostRecentTab.erase(
             std::remove(m_stateStruct->mostRecentTab.begin(),
                 m_stateStruct->mostRecentTab.end(),
@@ -688,7 +688,7 @@ bool WebEngineService::closeTab(TabId id) {
         m_stateStruct->mostRecentTab.end());
 
     if (m_stateStruct->tabs.size() == 0) {
-        m_stateStruct->currentTabId = TabId::NONE;
+        m_stateStruct->currentTabId == TabId::NONE;
         if (m_currentWebView) {
             disconnectSignals(m_currentWebView);
             m_currentWebView.reset();

diff --git a/services/WebEngineService/WebView.cpp b/services/WebEngineService/WebView.cpp
index 43f92b281b983fe91a1eef59856cd5b399e49828..b49e79671c166551a39e5f29a3c60d92af6e5432 100755 (executable)
--- a/services/WebEngineService/WebView.cpp
+++ b/services/WebEngineService/WebView.cpp
@@ -611,7 +611,7 @@ void WebView::__newWindowRequest(void *data, Evas_Object *, void *out)
     if (m_webEngine->tabsCount() >= tabLimit + 1)
         return;
 
-    if (currentTabId != (id = m_webEngine->addTab(std::string(),
+    if (currentTabId != (id == m_webEngine->addTab(std::string(),
                                                                  boost::none,
                                                                  std::string(),
                                                                  self->isDesktopMode(),
@@ -709,11 +709,7 @@ void WebView::__loadError(void* data, Evas_Object * obj, void* ewkError)
 
     WebView *self = reinterpret_cast<WebView*>(data);
     Ewk_Error *error = reinterpret_cast<Ewk_Error*>(ewkError);
-    Ewk_Error_Type errorType = ewk_error_type_get(error);
-
-    BROWSER_LOGD("[%s:%d] ewk_error_type: %d ",
-                 __PRETTY_FUNCTION__, __LINE__, errorType);
-
+ 
     BROWSER_LOGD("[%s:%d] emiting signal ", __PRETTY_FUNCTION__, __LINE__);
     int errorCode = ewk_error_code_get(error);
     if (errorCode == EWK_ERROR_NETWORK_STATUS_CANCELLED) {
@@ -1461,8 +1457,7 @@ void WebView::clearFormData()
 void WebView::searchOnWebsite(const std::string & searchString, int flags)
 {
     ///\todo: it should be "0" instead of "1024" for unlimited match count but it doesn't work properly in WebKit
-    Eina_Bool result = ewk_view_text_find(m_ewkView, searchString.c_str(), static_cast<Ewk_Find_Options>(flags), 1024);
-    BROWSER_LOGD("Ewk search; word: %s, result: %d", searchString.c_str(), result);
+    ewk_view_text_find(m_ewkView, searchString.c_str(), static_cast<Ewk_Find_Options>(flags), 1024);
 }
 
 void WebView::switchToDesktopMode() {