Cleanup non-class function names

Change-Id: I367b1592c494a037235126cbb99dc9c5a71455e7
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>
(cherry picked from commit 329af9a81a4ac54d3e74ea787a0da615055569d6)

diff --git a/include/ServerUtil.h b/include/ServerUtil.h
index c720c5e..9739b3f 100644 (file)
--- a/include/ServerUtil.h
+++ b/include/ServerUtil.h
@@ -24,17 +24,17 @@
 
 namespace ctx { namespace util {
 
-       bool isNormalUser(uid_t uid);
+       bool is_normal_user(uid_t uid);
 
-       bool isContainerUser(uid_t uid);
+       bool is_container_user(uid_t uid);
 
-       bool isSystem(uid_t uid);
+       bool is_system(uid_t uid);
 
-       std::string getSystemPath(enum tzplatform_variable id, const std::string& path);
+       std::string get_system_path(enum tzplatform_variable id, const std::string& path);
 
-       std::string getUserPath(uid_t uid, enum tzplatform_variable id, const std::string& path);
+       std::string get_user_path(uid_t uid, enum tzplatform_variable id, const std::string& path);
 
-       std::vector<std::string> getFiles(const std::string& dir, bool symlink = false);
+       std::vector<std::string> get_files(const std::string& dir, bool symlink = false);
 
 } }
 

diff --git a/include/SharedUtil.h b/include/SharedUtil.h
index e691959..718bf82 100644 (file)
--- a/include/SharedUtil.h
+++ b/include/SharedUtil.h
@@ -21,18 +21,18 @@
 #include <string>
 #include <ContextTypes.h>
 
-#define CTX_ERROR_DOMAIN       (ctx::util::dbusErrorQuark())
-#define CTX_ERROR_STR(X)       (ctx::util::getErrorString((X)))
+#define CTX_ERROR_DOMAIN       (ctx::util::dbus_error_quark())
+#define CTX_ERROR_STR(X)       (ctx::util::get_error_string((X)))
 
 #define STR_EQ(X, Y)           (g_strcmp0((X), (Y)) == 0)
 
 namespace ctx { namespace util {
 
-       const char* getErrorString(int error);
+       const char* get_error_string(int error);
 
-       GQuark dbusErrorQuark(void);
+       GQuark dbus_error_quark(void);
 
-       std::vector<std::string> tokenizeString(const std::string& in, const char* delim);
+       std::vector<std::string> tokenize_string(const std::string& in, const char* delim);
 
 } }
 

diff --git a/packaging/context-common.spec b/packaging/context-common.spec
index e468f4e..06f0a0d 100644 (file)
--- a/packaging/context-common.spec
+++ b/packaging/context-common.spec
@@ -1,7 +1,7 @@
 Name:       context-common
 Summary:    Tizen Context-Service Internal Shared Library
-Version:    4.0.0
-Release:    2
+Version:    4.0.1
+Release:    1
 Group:      Service Framework/Context
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz

diff --git a/src/server/PlatformDatabase.cpp b/src/server/PlatformDatabase.cpp
index 7a9b00e..a0c3a80 100644 (file)
--- a/src/server/PlatformDatabase.cpp
+++ b/src/server/PlatformDatabase.cpp
@@ -22,19 +22,19 @@
 
 using namespace ctx;
 
-static std::string __getPath(const std::string& dbName, uid_t uid)
+static std::string __get_path(const std::string& dbName, uid_t uid)
 {
        std::string path = "." + dbName + ".db";
 
-       if (util::isSystem(uid)) {
-               return util::getSystemPath(TZ_SYS_DB, path);
+       if (util::is_system(uid)) {
+               return util::get_system_path(TZ_SYS_DB, path);
        } else {
-               return util::getUserPath(uid, TZ_USER_DB, path);
+               return util::get_user_path(uid, TZ_USER_DB, path);
        }
 }
 
 PlatformDatabase::PlatformDatabase(const std::string& dbName, uid_t uid) :
-       Database(__getPath(dbName, uid))
+       Database(__get_path(dbName, uid))
 {
 }
 

diff --git a/src/server/ServerUtil.cpp b/src/server/ServerUtil.cpp
index 9df01cd..736938f 100644 (file)
--- a/src/server/ServerUtil.cpp
+++ b/src/server/ServerUtil.cpp
@@ -30,7 +30,7 @@ static GMutex __pathMutex;
 static uid_t __normalUid       = ROOT_UID;     // Last known normal user UID
 static uid_t __containerUid    = ROOT_UID;     // Last known container user UID
 
-EXPORT_API bool util::isNormalUser(uid_t uid)
+EXPORT_API bool util::is_normal_user(uid_t uid)
 {
        if (uid == ROOT_UID)
                return false;
@@ -54,7 +54,7 @@ EXPORT_API bool util::isNormalUser(uid_t uid)
        return false;
 }
 
-EXPORT_API bool util::isContainerUser(uid_t uid)
+EXPORT_API bool util::is_container_user(uid_t uid)
 {
        if (uid == ROOT_UID)
                return false;
@@ -78,12 +78,12 @@ EXPORT_API bool util::isContainerUser(uid_t uid)
        return false;
 }
 
-EXPORT_API bool util::isSystem(uid_t uid)
+EXPORT_API bool util::is_system(uid_t uid)
 {
-       return (!isNormalUser(uid) && !isContainerUser(uid));
+       return (!is_normal_user(uid) && !is_container_user(uid));
 }
 
-EXPORT_API std::string util::getSystemPath(enum tzplatform_variable id, const std::string& path)
+EXPORT_API std::string util::get_system_path(enum tzplatform_variable id, const std::string& path)
 {
        ScopeMutex sm(&__pathMutex);
 
@@ -93,9 +93,9 @@ EXPORT_API std::string util::getSystemPath(enum tzplatform_variable id, const st
        return std::string(rawPath);
 }
 
-EXPORT_API std::string util::getUserPath(uid_t uid, enum tzplatform_variable id, const std::string& path)
+EXPORT_API std::string util::get_user_path(uid_t uid, enum tzplatform_variable id, const std::string& path)
 {
-       IF_FAIL_RETURN_TAG(!util::isSystem(uid), EMPTY_STR, _E, "Invalid UID");
+       IF_FAIL_RETURN_TAG(!util::is_system(uid), EMPTY_STR, _E, "Invalid UID");
 
        ScopeMutex sm(&__pathMutex);
 
@@ -124,7 +124,7 @@ EXPORT_API std::string util::getUserPath(uid_t uid, enum tzplatform_variable id,
        return outPath;
 }
 
-EXPORT_API std::vector<std::string> util::getFiles(const std::string& dirPath, bool symlink)
+EXPORT_API std::vector<std::string> util::get_files(const std::string& dirPath, bool symlink)
 {
        static GMutex dirMutex;
 

diff --git a/src/shared/SharedUtil.cpp b/src/shared/SharedUtil.cpp
index 236215f..859677a 100644 (file)
--- a/src/shared/SharedUtil.cpp
+++ b/src/shared/SharedUtil.cpp
@@ -42,7 +42,7 @@ static const GDBusErrorEntry __ctxErrorEntries[] =
        {E_INV_DATA,    ERROR_PREFIX "InvData"},
 };
 
-EXPORT_API const char* util::getErrorString(int error)
+EXPORT_API const char* util::get_error_string(int error)
 {
        if (error == E_NONE)
                return "Success";
@@ -55,7 +55,7 @@ EXPORT_API const char* util::getErrorString(int error)
        return "Unknown";
 }
 
-EXPORT_API GQuark util::dbusErrorQuark(void)
+EXPORT_API GQuark util::dbus_error_quark(void)
 {
        static volatile gsize quarkVolatile = 0;
        g_dbus_error_register_error_domain("tizen-ctx-error-quark",
@@ -63,7 +63,7 @@ EXPORT_API GQuark util::dbusErrorQuark(void)
        return (GQuark)quarkVolatile;
 }
 
-EXPORT_API std::vector<std::string> util::tokenizeString(const std::string& in, const char* delim)
+EXPORT_API std::vector<std::string> util::tokenize_string(const std::string& in, const char* delim)
 {
        std::vector<std::string> tokens;
        char* inputStr = g_strdup(in.c_str());