diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2019-03-14 13:55:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@automotivelinux.org> | 2019-03-14 13:55:44 +0000 |
| commit | 1808ab2892ead7aac9227033278bd82ba5a6eae0 (patch) | |
| tree | 957615a2b26d22ae72a201805dc040a516c09414 | |
| parent | 6422c9a6c76602d408168d401ac657214e918799 (diff) | |
| parent | 33a9b221a28cb0352dabc49ed17bc886d0d4a86e (diff) | |
Merge "Output debug message corerctly" into guppy
| -rw-r--r-- | src/window_manager.cpp | 6 | ||||
| -rw-r--r-- | src/wm_layer_control.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/window_manager.cpp b/src/window_manager.cpp index 22f1e22..abd4552 100644 --- 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")); - 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"); @@ -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"); - 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"; @@ -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_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 diff --git a/src/wm_layer_control.cpp b/src/wm_layer_control.cpp index 28d409f..c5c7913 100644 --- 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) { - 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); |