Merge remote-tracking branch 'origin/tizen_3.0' into tizen

Conflicts:
	client/tts_dbus.c
	common/tts_config_mgr.c
	common/tts_config_parser.c
	engine-parser/src/tts-engine-parser.c
	server/ttsd_data.cpp
	server/ttsd_dbus.c

Change-Id: I3c402f69af42e38cd6c7810ab3f8792a501d39bb

diff --git a/common/tts_config_mgr.c b/common/tts_config_mgr.c
index e05446d..717ff9a 100644 (file)
--- a/common/tts_config_mgr.c
+++ b/common/tts_config_mgr.c
@@ -766,8 +766,6 @@ void __tts_config_release_engine()
 int __tts_config_mgr_get_engine_info()
 {
        DIR *dp = NULL;
-       int ret = -1;
-       struct dirent entry;
        struct dirent *dirp = NULL;
 
        char filepath[512] = {'\0',};
@@ -784,11 +782,7 @@ int __tts_config_mgr_get_engine_info()
                SLOG(LOG_DEBUG, tts_tag(), "[CONFIG] No default directory : %s", TTS_DEFAULT_ENGINE_INFO);
        } else {
                do {
-                       ret = readdir_r(dp, &entry, &dirp);
-                       if (0 != ret) {
-                               SLOG(LOG_ERROR, tts_tag(), "[CONFIG] Fail to read directory");
-                               break;
-                       }
+                       dirp = readdir(dp);
 
                        if (NULL != dirp) {
                                if (!strcmp(".", dirp->d_name) || !strcmp("..", dirp->d_name))
@@ -826,11 +820,7 @@ int __tts_config_mgr_get_engine_info()
                SLOG(LOG_DEBUG, tts_tag(), "[CONFIG] No downloadable directory : %s", TTS_DOWNLOAD_ENGINE_INFO);
        } else {
                do {
-                       ret = readdir_r(dp, &entry, &dirp);
-                       if (0 != ret) {
-                               SLOG(LOG_ERROR, tts_tag(), "[CONFIG] Fail to read directory");
-                               break;
-                       }
+                       dirp = readdir(dp);
 
                        if (NULL != dirp) {
                                if (!strcmp(".", dirp->d_name) || !strcmp("..", dirp->d_name))

diff --git a/server/ttsd_dbus.c b/server/ttsd_dbus.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/server/ttsd_server.c b/server/ttsd_server.c
index 1e016e5..8820904 100644 (file)
--- a/server/ttsd_server.c
+++ b/server/ttsd_server.c
@@ -557,9 +557,7 @@ static Eina_Bool __quit_ecore_loop(void *data)
 static void __read_proc()
 {
        DIR *dp = NULL;
-       struct dirent entry;
        struct dirent *dirp = NULL;
-       int ret = -1;
        int tmp;
 
        GList *iter = NULL;
@@ -577,11 +575,7 @@ static void __read_proc()
                SLOG(LOG_ERROR, tts_tag(), "[ERROR] Fail to open proc");
        } else {
                do {
-                       ret = readdir_r(dp, &entry, &dirp);
-                       if (0 != ret) {
-                               SLOG(LOG_ERROR, tts_tag(), "[ERROR] Fail to readdir");
-                               break;
-                       }
+                       dirp = readdir(dp);
 
                        if (NULL != dirp) {
                                tmp = atoi(dirp->d_name);