Output debug message corerctly

Fix the mistake of passing std::string into %s.

Change-Id: I267feba5ed8239d146506721363f5bebcdaafa42
Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>

diff --git a/src/window_manager.cpp b/src/window_manager.cpp
index 22f1e22..abd4552 100644 (file)
--- a/src/window_manager.cpp
+++ b/src/window_manager.cpp
@@ -172,7 +172,7 @@ result<int> WindowManager::api_request_surface(char const *appid, char const *dr
         {
             // register drawing_name as fallback and make it displayed.
             lid = this->lc->getNewLayerID(string("fallback"));
         {
             // register drawing_name as fallback and make it displayed.
             lid = this->lc->getNewLayerID(string("fallback"));

-            HMI_DEBUG("%s is not registered in layers.json, then fallback as normal app", role);
+            HMI_DEBUG("%s is not registered in layers.json, then fallback as normal app", role.c_str());

             if (lid == 0)
             {
                 return Err<int>("Designated role does not match any role, fallback is disabled");
             if (lid == 0)
             {
                 return Err<int>("Designated role does not match any role, fallback is disabled");


@@ -229,7 +229,7 @@ char const *WindowManager::api_request_surface(char const *appid, char const *dr
         {
             // register drawing_name as fallback and make it displayed.
             l_id = this->lc->getNewLayerID("fallback");
         {
             // register drawing_name as fallback and make it displayed.
             l_id = this->lc->getNewLayerID("fallback");

-            HMI_DEBUG("%s is not registered in layers.json, then fallback as normal app", role);
+            HMI_DEBUG("%s is not registered in layers.json, then fallback as normal app", role.c_str());

             if (l_id == 0)
             {
                 return "Designated role does not match any role, fallback is disabled";
             if (l_id == 0)
             {
                 return "Designated role does not match any role, fallback is disabled";


@@ -486,7 +486,7 @@ bool WindowManager::api_subscribe(afb_req_t req, EventType event_id)
         HMI_ERROR("not defined in Window Manager", event_id);
         return ret;
     }
         HMI_ERROR("not defined in Window Manager", event_id);
         return ret;
     }

-    HMI_INFO("%s subscribe %s : %d", appid, kListEventName[event_id], event_id);
+    HMI_INFO("%s subscribe %s : %d", appid, kListEventName[event_id].c_str(), event_id);

     if(event_id == Event_ScreenUpdated)
     {
         // Event_ScreenUpdated should be emitted to subscriber
     if(event_id == Event_ScreenUpdated)
     {
         // Event_ScreenUpdated should be emitted to subscriber

diff --git a/src/wm_layer_control.cpp b/src/wm_layer_control.cpp
index 28d409f..c5c7913 100644 (file)
--- a/src/wm_layer_control.cpp
+++ b/src/wm_layer_control.cpp
@@ -278,7 +278,7 @@ void LayerControl::undoUpdate()
 
 WMError LayerControl::loadLayerSetting(const string &path)
 {
 
 WMError LayerControl::loadLayerSetting(const string &path)
 {

-    HMI_DEBUG("loading WMLayer(Application Containers) Setting from %s", path);
+    HMI_DEBUG("loading WMLayer(Application Containers) Setting from %s", path.c_str());

 
     json_object *json_obj, *json_cfg;
     int ret = jh::inputJsonFilie(path.c_str(), &json_obj);
 
     json_object *json_obj, *json_cfg;
     int ret = jh::inputJsonFilie(path.c_str(), &json_obj);