Fix compilation warnings

Change-Id: Iaf31217dc685ca339e75ead1cfd8a5e0f7afd02a

diff --git a/dcm-daemon/dcmsession.cpp b/dcm-daemon/dcmsession.cpp
index c464dab..5432a84 100644 (file)
--- a/dcm-daemon/dcmsession.cpp
+++ b/dcm-daemon/dcmsession.cpp
@@ -378,7 +378,7 @@ void dcm_session::handle_cert_chain(const RequestCertificateChain& message)
        std::string cert_chain;
        x509_crt_rewriter parser;
 
-       int error;
+       int error = 0;
        bool loaded = fSoResolver->ensure_loaded();
        if (loaded) {
                error = fSoResolver->invoke<int, dcm_backend_context&, std::string&>(
@@ -467,7 +467,7 @@ void dcm_session::handle_sign_request(const SignRequest& message)
                }
        }
 
-       int error;
+       int error = 0;
        bool loaded = fSoResolver->ensure_loaded();
        if (loaded) {
                error = fSoResolver->invoke<int, dcm_backend_context&, MessageDigestType, const std::string&, std::string&>(

diff --git a/dcm-daemon/serviceadapter.cpp b/dcm-daemon/serviceadapter.cpp
index 11b990d..769a7c7 100644 (file)
--- a/dcm-daemon/serviceadapter.cpp
+++ b/dcm-daemon/serviceadapter.cpp
@@ -1,6 +1,6 @@
 /******************************************************************
  *
- * Copyright 2017 Samsung Electronics All Rights Reserved.
+ * Copyright 2017 - 2019 Samsung Electronics All Rights Reserved.
  *
  * Author: Jaroslaw Pelczar <j.pelczar@samsung.com>
  *
@@ -98,8 +98,10 @@ void service_adapter::notify_start_failure(int error)
        if(!fStartCompleteNotified) {
                char buffer[512];
                buffer[0] = '\0';
-               strerror_r(error, buffer, sizeof(buffer));
-               sd_notifyf(0, "STATUS=Failed to start up: %s\nERRNO=%d", buffer, error);
+               if(!strerror_r(error, buffer, sizeof(buffer)))
+                       sd_notifyf(0, "STATUS=Failed to start up: %s\nERRNO=%d", buffer, error);
+               else
+                       sd_notifyf(0, "STATUS=Failed to start up: (no message)\nERRNO=%d", error);
        }
 #endif
 }

diff --git a/shared/boost_log_dlog_sink.h b/shared/boost_log_dlog_sink.h
index 9ebd4f7..625c8c0 100644 (file)
--- a/shared/boost_log_dlog_sink.h
+++ b/shared/boost_log_dlog_sink.h
@@ -1,6 +1,6 @@
 /******************************************************************
  *
- * Copyright 2017 Samsung Electronics All Rights Reserved.
+ * Copyright 2017 - 2019 Samsung Electronics All Rights Reserved.
  *
  * Author: Jaroslaw Pelczar <j.pelczar@samsung.com>
  *
@@ -75,7 +75,7 @@ private:
 
        inline void send(log_priority level, string_type const& formatted_message) {
 #ifdef USE_DLOG_LOGGING
-               dlog_print(level, log_domain_.c_str(), formatted_message.c_str());
+               dlog_print(level, log_domain_.c_str(), "%s", formatted_message.c_str());
 #else
                fprintf(stderr, "%d/(%s): %s\n", level, log_domain_.c_str(), formatted_message.c_str());
 #endif