aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKazumasa Mitsunari <knimitz@witz-inc.co.jp>2018-06-24 15:40:03 +0900
committerKazumasa Mitsunari <knimitz@witz-inc.co.jp>2018-06-24 15:40:03 +0900
commit7443e6664924dfa2cc553d16d63ae58b7de53e73 (patch)
tree33cf54d84f8ab24017e7b3c1ae2a8b663173833b
parent11ed192767f50ad5cd93f5c780a38c7a44238531 (diff)
Fix the function name due to spell mistake
Change-Id: Ic4d8ebcdcdd5edb1c14509e3fbb382535872805e Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
-rw-r--r--src/main.cpp6
-rw-r--r--src/window_manager.cpp7
-rw-r--r--src/window_manager.hpp2
3 files changed, 7 insertions, 8 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 85abf24..b2088d1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -375,7 +375,7 @@ void windowmanager_activatesurface(afb_req req) noexcept
catch (std::exception &e)
{
HMI_WARNING("wm", "failed: Uncaught exception while calling activatesurface: %s", e.what());
- g_afb_instance->wmgr.exeptionProcessForTransition();
+ g_afb_instance->wmgr.exceptionProcessForTransition();
return;
}
}
@@ -416,7 +416,7 @@ void windowmanager_deactivatesurface(afb_req req) noexcept
catch (std::exception &e)
{
HMI_WARNING("wm", "failed: Uncaught exception while calling deactivatesurface: %s", e.what());
- g_afb_instance->wmgr.exeptionProcessForTransition();
+ g_afb_instance->wmgr.exceptionProcessForTransition();
return;
}
}
@@ -449,7 +449,7 @@ void windowmanager_enddraw(afb_req req) noexcept
catch (std::exception &e)
{
HMI_WARNING("wm", "failed: Uncaught exception while calling enddraw: %s", e.what());
- g_afb_instance->wmgr.exeptionProcessForTransition();
+ g_afb_instance->wmgr.exceptionProcessForTransition();
return;
}
}
diff --git a/src/window_manager.cpp b/src/window_manager.cpp
index 98883a5..50e2f85 100644
--- a/src/window_manager.cpp
+++ b/src/window_manager.cpp
@@ -91,8 +91,7 @@ struct result<layer_map> load_layer_map(char const *filename)
return to_layer_map(jids);
}
-static int
-processTimerHandler(sd_event_source *s, uint64_t usec, void *userdata)
+static int processTimerHandler(sd_event_source *s, uint64_t usec, void *userdata)
{
HMI_NOTICE("wm", "Time out occurs because the client replys endDraw slow, so revert the request");
reinterpret_cast<wm::WindowManager *>(userdata)->timerHandler();
@@ -116,10 +115,10 @@ void WindowManager::removeClient(const std::string &appid)
g_app_list.removeClient(appid);
}
-void WindowManager::exeptionProcessForTransition()
+void WindowManager::exceptionProcessForTransition()
{
unsigned req_num = g_app_list.currentRequestNumber();
- HMI_SEQ_NOTICE(req_num, "Process exeption handling for request. Remove current request %d", req_num);
+ HMI_SEQ_NOTICE(req_num, "Process exception handling for request. Remove current request %d", req_num);
g_app_list.removeRequest(req_num);
HMI_SEQ_NOTICE(g_app_list.currentRequestNumber(), "Process next request if exists");
this->processNextRequest();
diff --git a/src/window_manager.hpp b/src/window_manager.hpp
index cc189b5..99a30e0 100644
--- a/src/window_manager.hpp
+++ b/src/window_manager.hpp
@@ -222,7 +222,7 @@ class WindowManager
void surface_removed(uint32_t surface_id);
void removeClient(const std::string &appid);
- void exeptionProcessForTransition();
+ void exceptionProcessForTransition();
bool subscribeEventForApp(const std::string &appid, afb_req req, const std::string &evname);
// Do not use this function
//static int processTimerHandler(sd_event_source *s, uint64_t usec, void *userdata);