Cleanup non-class function names

Change-Id: Iadfd05a82e1e90a986d082672c42ab540f99a233
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>

diff --git a/src/server/Credential.cpp b/src/server/Credential.cpp
index 6a29163..7ace5c3 100644 (file)
--- a/src/server/Credential.cpp
+++ b/src/server/Credential.cpp
@@ -159,5 +159,5 @@ const std::string& Credential::getClientId() const
 
 bool Credential::isSystem() const
 {
-       return util::isSystem(__uid);
+       return util::is_system(__uid);
 }

diff --git a/src/server/ServerMain.cpp b/src/server/ServerMain.cpp
index 3738a00..8bee8e4 100644 (file)
--- a/src/server/ServerMain.cpp
+++ b/src/server/ServerMain.cpp
@@ -67,7 +67,7 @@ static ServiceLoader __serviceLoader;
 static ActiveUserMonitor __activeUserMonitor(&__serviceLoader);
 static AlarmInitializer __alarmInit;
 
-static void __startService(GDBusConnection* conn)
+static void __start_service(GDBusConnection* conn)
 {
        __activeUserMonitor.start(conn);
 
@@ -81,7 +81,7 @@ static void __startService(GDBusConnection* conn)
        __serviceLoader.startSystem();
 }
 
-static gboolean __stopService(gpointer data)
+static gboolean __stop_service(gpointer data)
 {
        __activeUserMonitor.stop();
 
@@ -92,27 +92,27 @@ static gboolean __stopService(gpointer data)
        return G_SOURCE_REMOVE;
 }
 
-static void __busAcquired(GDBusConnection* conn)
+static void __bus_acquired(GDBusConnection* conn)
 {
-       __startService(conn);
+       __start_service(conn);
 }
 
-static void __busLost(GDBusConnection* conn)
+static void __bus_lost(GDBusConnection* conn)
 {
-       __stopService(NULL);
+       __stop_service(NULL);
 }
 
-static void __onSignal(int signum)
+static void __on_signal(int signum)
 {
        _I(YELLOW("SIGNAL-%d: '%s'"), signum, strsignal(signum));
        static bool terminated = false;
        if (!terminated) {
-               g_idle_add(__stopService, NULL);
+               g_idle_add(__stop_service, NULL);
                terminated = true;
        }
 }
 
-static void __onTerminate()
+static void __on_terminate()
 {
        try {
                auto unknown = std::current_exception();
@@ -126,7 +126,7 @@ static void __onTerminate()
        }
 }
 
-static void __onNewFailed()
+static void __on_new_failed()
 {
        static unsigned failCount = 0;
        _E_ALLOC;
@@ -137,16 +137,16 @@ static void __onNewFailed()
 
 int main(int argc, char* argv[])
 {
-       std::signal(SIGINT, __onSignal);
-       std::signal(SIGHUP, __onSignal);
-       std::signal(SIGTERM, __onSignal);
-       std::signal(SIGQUIT, __onSignal);
-       std::signal(SIGABRT, __onSignal);
+       std::signal(SIGINT, __on_signal);
+       std::signal(SIGHUP, __on_signal);
+       std::signal(SIGTERM, __on_signal);
+       std::signal(SIGQUIT, __on_signal);
+       std::signal(SIGABRT, __on_signal);
 
-       std::set_terminate(__onTerminate);
-       std::set_new_handler(__onNewFailed);
+       std::set_terminate(__on_terminate);
+       std::set_new_handler(__on_new_failed);
 
-       DBusConnector dbusConnector(__busAcquired, __busLost);
+       DBusConnector dbusConnector(__bus_acquired, __bus_lost);
 
        MainLoop::start();
 

diff --git a/src/server/ServiceLoader.cpp b/src/server/ServiceLoader.cpp
index 70b2a6e..e20fdcf 100644 (file)
--- a/src/server/ServiceLoader.cpp
+++ b/src/server/ServiceLoader.cpp
@@ -89,7 +89,7 @@ void ServiceLoader::stopSystem()
 
 void ServiceLoader::startUser(uid_t uid)
 {
-       if (util::isNormalUser(uid)) {
+       if (util::is_normal_user(uid)) {
                for (auto& runner : __userServices) {
                        runner->stop();
                        runner->start(uid);
@@ -99,7 +99,7 @@ void ServiceLoader::startUser(uid_t uid)
 
 void ServiceLoader::stopUser(uid_t uid)
 {
-       if (util::isNormalUser(uid)) {
+       if (util::is_normal_user(uid)) {
                for (auto& runner : __userServices) {
                        runner->stop();
                }

diff --git a/src/server/ServiceRunner.cpp b/src/server/ServiceRunner.cpp
index f29edbc..eb0b058 100644 (file)
--- a/src/server/ServiceRunner.cpp
+++ b/src/server/ServiceRunner.cpp
@@ -283,7 +283,7 @@ ServiceClient* UserServiceRunner::__createClient(const std::string& busName)
                return NULL;
        }
 
-       if (!util::isNormalUser(client->getUid())) {
+       if (!util::is_normal_user(client->getUid())) {
                _W("%s does not support container users.", serviceInstance->getServiceName());
                delete client;
                return NULL;