Remove media-util-internal.h

1. Move defines to media-util.h
2. Remove duplicated defines from media-common-types.h

Change-Id: Ia5448c5f1857f37e47bdf6e0592d724cd5c880ac
Signed-off-by: minje.ahn <minje.ahn@samsung.com>

diff --git a/lib/include/media-util-db.h b/lib/include/media-util-db.h
index a5af02a..5c41c27 100644 (file)
--- a/lib/include/media-util-db.h
+++ b/lib/include/media-util-db.h
@@ -27,6 +27,8 @@ extern "C" {
 #include <stdbool.h>
 #include <sqlite3.h>
 
+#define MS_SQL_SAFE_FREE(x)    {if (x != NULL) {sqlite3_free(x); x = NULL; } }
+
 int media_db_connect(sqlite3 **handle, uid_t uid, bool need_write);
 void media_db_disconnect(sqlite3 *handle);
 int media_db_request_update_db(const char *query_str, uid_t uid);

diff --git a/lib/include/media-util-internal.h b/lib/include/media-util-internal.h
deleted file mode 100644 (file)
index fa2375d..0000000
--- a/lib/include/media-util-internal.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Media Utility
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#ifndef _MEDIA_UTIL_INTERNAL_H_
-#define _MEDIA_UTIL_INTERNAL_H_
-
-#include <glib.h>
-#include <sqlite3.h>
-
-#define MS_SAFE_FREE(src)              { if (src) {free(src); src = NULL; } }
-#define MS_SQL_SAFE_FREE(x)    {if (x != NULL) {sqlite3_free(x); x = NULL; } }
-#define MS_STRING_VALID(str)   ((str != NULL && strlen(str) > 0) ? true : false)
-#define SAFE_STRLCPY(dst, src, n)      g_strlcpy(dst, src, n);
-
-#endif /*_MEDIA_UTIL_INTERNAL_H_*/

diff --git a/lib/include/media-util.h b/lib/include/media-util.h
index 4d41eec..4aea819 100644 (file)
--- a/lib/include/media-util.h
+++ b/lib/include/media-util.h
@@ -47,4 +47,9 @@
 
 #define MEDIA_DEFAULT_UID 5001
 
+#define MS_SAFE_FREE(src)              { if (src) {free(src); src = NULL; } }
+#define MS_STRING_VALID(str)   ((str != NULL && strlen(str) > 0) ? true : false)
+#define SAFE_STRLCPY(dst, src, n)      g_strlcpy(dst, src, n);
+#define SAFE_STRLCAT(dst, src, n)      g_strlcat(dst, src, n);
+
 #endif /*_MEDIA_UTIL_H_*/

diff --git a/lib/media-util-cynara.c b/lib/media-util-cynara.c
index 3f93af8..f0f4c9c 100644 (file)
--- a/lib/media-util-cynara.c
+++ b/lib/media-util-cynara.c
@@ -32,7 +32,6 @@
 #include <media-util-cynara.h>
 #include <media-util-dbg.h>
 #include <media-util-err.h>
-#include <media-util-internal.h>
 
 #include <cynara-client.h>
 #include <cynara-session.h>
@@ -118,7 +117,10 @@ int ms_cynara_receive_untrusted_message(int sockfd, ms_comm_msg_s *recv_msg, ms_
        ret = cynara_creds_socket_get_client(sockfd, CLIENT_METHOD_SMACK, &(credentials->smack));
        if (ret != 0) {
                MSAPI_DBG_ERR("[CYNARA]Failed to get smack");
-               MS_SAFE_FREE(credentials->uid);
+               if (credentials->uid) {
+                       free(credentials->uid);
+                       credentials->uid = NULL;
+               }
 
                return MS_MEDIA_ERR_INTERNAL;
        }
@@ -128,8 +130,8 @@ int ms_cynara_receive_untrusted_message(int sockfd, ms_comm_msg_s *recv_msg, ms_
 
 int ms_cynara_check(const ms_peer_credentials *creds, const char *privilege)
 {
-       int result;
-       char *session;
+       int result = 0;
+       char *session = NULL;
 
        if (!creds || !privilege)
                return MS_MEDIA_ERR_INVALID_PARAMETER;
@@ -144,7 +146,9 @@ int ms_cynara_check(const ms_peer_credentials *creds, const char *privilege)
        if (result != CYNARA_API_ACCESS_ALLOWED)
                ms_cynara_dbg_err("cynara_check", result);
 
-       MS_SAFE_FREE(session);
+       if (session)
+               free(session);
+
        return result == CYNARA_API_ACCESS_ALLOWED ? MS_MEDIA_ERR_NONE : MS_MEDIA_ERR_PERMISSION_DENIED;
 }
 

diff --git a/lib/media-util-db.c b/lib/media-util-db.c
index 0d75c4c..6c2cf6c 100644 (file)
--- a/lib/media-util-db.c
+++ b/lib/media-util-db.c
@@ -27,7 +27,6 @@
 #include <vconf.h>
 
 #include "media-util-dbg.h"
-#include "media-util-internal.h"
 #include "media-util.h"
 
 #define MS_TIMEOUT_SEC 10

diff --git a/lib/media-util-ipc.c b/lib/media-util-ipc.c
index ad6cccc..3df9848 100644 (file)
--- a/lib/media-util-ipc.c
+++ b/lib/media-util-ipc.c
@@ -24,7 +24,6 @@
 
 #include "media-util-dbg.h"
 #include "media-util.h"
-#include "media-util-internal.h"
 
 char MEDIA_IPC_PATH[][70] = {
        {"media-server/media_ipc_scanner.socket"},

diff --git a/lib/media-util-noti.c b/lib/media-util-noti.c
index 55e9707..6dd8d29 100644 (file)
--- a/lib/media-util-noti.c
+++ b/lib/media-util-noti.c
@@ -29,7 +29,6 @@
 #include <glib.h>
 #include <gio/gio.h>
 
-#include "media-util-internal.h"
 #include "media-util-dbg.h"
 #include "media-util.h"
 

diff --git a/lib/media-util-register.c b/lib/media-util-register.c
index 424dc73..69bb5a0 100644 (file)
--- a/lib/media-util-register.c
+++ b/lib/media-util-register.c
@@ -20,7 +20,6 @@
 #include <unistd.h>
 #include <sys/syscall.h>
 
-#include "media-util-internal.h"
 #include "media-util-dbg.h"
 #include "media-util.h"
 

diff --git a/lib/media-util-user.c b/lib/media-util-user.c
index 3db343e..1460125 100644 (file)
--- a/lib/media-util-user.c
+++ b/lib/media-util-user.c
@@ -18,7 +18,6 @@
  */
 
 #include "media-util-dbg.h"
-#include "media-util-internal.h"
 #include "media-util.h"
 #include <glib.h>
 #include <unistd.h>

diff --git a/src/common/include/media-common-types.h b/src/common/include/media-common-types.h
index 08ab7bd..9aaeff6 100644 (file)
--- a/src/common/include/media-common-types.h
+++ b/src/common/include/media-common-types.h
@@ -51,17 +51,6 @@
 /*Use for Poweroff sequence*/
 #define POWEROFF -1 /*This number uses for stopping Scannig thread*/
 
-#define MS_SAFE_FREE(src)              { if (src) {free(src); src = NULL; } }
-#define MS_STRING_VALID(str)   \
-                                                               ((str != NULL && strlen(str) > 0) ? true : false)
-#define SAFE_STRLCPY(dst, src, n)      g_strlcpy(dst, src, n);
-#define SAFE_STRLCAT(dst, src, n)      g_strlcat(dst, src, n);
-
-#define MS_SQLITE3_FINALIZE(x)         if (x != NULL) sqlite3_finalize(x);
-#define MS_SQLITE3_SAFE_FREE(x)          {if (x != NULL) {sqlite3_free(x); x = NULL; } }
-
-#define MS_FILE_PATH_LEN_MAX 4096
-
 typedef enum {
        MS_SCAN_INVALID,
        MS_SCAN_PART,

diff --git a/src/common/media-common-db-svc.c b/src/common/media-common-db-svc.c
index 641f0da..d1b0588 100644 (file)
--- a/src/common/media-common-db-svc.c
+++ b/src/common/media-common-db-svc.c
@@ -257,7 +257,7 @@ static int __ms_check_item_exist(sqlite3 *handle, const char *storage_id, const
                }
        }
 
-       MS_SQLITE3_FINALIZE(sql_stmt);
+       sqlite3_finalize(sql_stmt);
 
        return ret;
 }
@@ -302,7 +302,7 @@ int ms_validity_change_all_items(sqlite3 *handle, const char *storage_id, bool v
 #endif
 
        ret = media_db_update_db_direct(sql, uid);
-       MS_SQLITE3_SAFE_FREE(sql);
+       MS_SQL_SAFE_FREE(sql);
 
        return ret;
 }
@@ -353,7 +353,7 @@ int ms_delete_invalid_items(sqlite3 *handle, const char *storage_id, uid_t uid)
                g_ptr_array_add(thumb_list, path);
        }
 
-       MS_SQLITE3_FINALIZE(sql_stmt);
+       sqlite3_finalize(sql_stmt);
 
 #ifdef _USE_TVPD_MODE
        sql = sqlite3_mprintf("DELETE FROM '%q' WHERE validity IN (%d, %d)", storage_id, MS_INVALID, MS_SCANNING);
@@ -362,7 +362,7 @@ int ms_delete_invalid_items(sqlite3 *handle, const char *storage_id, uid_t uid)
 #endif
 
        ret = media_db_update_db_direct(sql, uid);
-       MS_SQLITE3_SAFE_FREE(sql);
+       MS_SQL_SAFE_FREE(sql);
        if (ret != MS_MEDIA_ERR_NONE) {
                g_ptr_array_free(thumb_list, TRUE);
                return ret;
@@ -401,7 +401,7 @@ int ms_set_folder_item_validity(sqlite3 *handle, const char *storage_id, const c
 #endif
 
        ret = media_db_update_db_direct(sql, uid);
-       MS_SQLITE3_SAFE_FREE(sql);
+       MS_SQL_SAFE_FREE(sql);
 
        return ret;
 }
@@ -458,7 +458,7 @@ int ms_delete_invalid_folder(const char *storage_id, uid_t uid)
 #endif
        ret = media_db_update_db_direct(sql, uid);
 
-       MS_SQLITE3_SAFE_FREE(sql);
+       MS_SQL_SAFE_FREE(sql);
 
        return ret;
 }
@@ -592,7 +592,7 @@ int ms_get_folder_id(sqlite3 *handle, const char *storage_id, const char *path,
                ret = MS_MEDIA_ERR_DB_NO_RECORD;
        }
 
-       MS_SQLITE3_FINALIZE(sql_stmt);
+       sqlite3_finalize(sql_stmt);
 
        return ret;
 }

diff --git a/src/common/media-common-utils-tv.c b/src/common/media-common-utils-tv.c
index f290639..a7a40cc 100644 (file)
--- a/src/common/media-common-utils-tv.c
+++ b/src/common/media-common-utils-tv.c
@@ -268,7 +268,7 @@ int ms_check_scan_ignore(char *path, uid_t uid)
        const char *ignore_file = ".scan_ignore";
        char *tmp_path = NULL;
        char *org_path = NULL;
-       char ignore_path[MS_FILE_PATH_LEN_MAX] = {0, };
+       char ignore_path[MAX_FILEPATH_LEN] = {0, };
 
        /* Check for symbolic link */
        tmp_path = realpath(path, NULL);

diff --git a/src/common/media-common-utils.c b/src/common/media-common-utils.c
index 184190f..ed4ce53 100644 (file)
--- a/src/common/media-common-utils.c
+++ b/src/common/media-common-utils.c
@@ -114,9 +114,9 @@ int ms_check_scan_ignore(char *path, uid_t uid)
        const char *ignore_file = ".scan_ignore";
        char *tmp_path = NULL;
        char *org_path = NULL;
-       char ignore_path[MS_FILE_PATH_LEN_MAX] = {0, };
+       char ignore_path[MAX_FILEPATH_LEN] = {0, };
 
-       char replace[MS_FILE_PATH_LEN_MAX] = {0, };
+       char replace[MAX_FILEPATH_LEN] = {0, };
        char *mediashared = NULL;
 
        /* Check for symbolic link */
@@ -126,7 +126,7 @@ int ms_check_scan_ignore(char *path, uid_t uid)
 
        if (g_str_has_prefix(tmp_path, MEDIA_SHARE_PATH)) {
                ms_user_get_mediashared_path(uid, &mediashared);
-               snprintf(replace, MS_FILE_PATH_LEN_MAX, "%s%s", mediashared, tmp_path + strlen(MEDIA_SHARE_PATH));
+               snprintf(replace, MAX_FILEPATH_LEN, "%s%s", mediashared, tmp_path + strlen(MEDIA_SHARE_PATH));
                MS_SAFE_FREE(mediashared);
                if (g_strcmp0(replace, org_path) != 0) {
                        MS_SAFE_FREE(tmp_path);

diff --git a/src/scanner-v2/media-scanner-scan-v2.c b/src/scanner-v2/media-scanner-scan-v2.c
index 8e76437..c0ef135 100644 (file)
--- a/src/scanner-v2/media-scanner-scan-v2.c
+++ b/src/scanner-v2/media-scanner-scan-v2.c
@@ -184,7 +184,7 @@ static int __msc_dir_scan_for_folder(sqlite3 *handle, const char *storage_id, ch
        int ret = MS_MEDIA_ERR_NONE;
        char *new_path = NULL;
        char *current_path = NULL;
-       char path[MS_FILE_PATH_LEN_MAX] = {0, };
+       char path[MAX_FILEPATH_LEN] = {0, };
        bool is_recursive = (msg_type == MS_MSG_DIRECTORY_SCANNING);
        char *new_start_path = NULL;
 
@@ -292,7 +292,7 @@ static int __msc_dir_scan_for_folder(sqlite3 *handle, const char *storage_id, ch
                        if (strcmp(dir_entry->d_name, RECYCLE_DIR_NAME) == 0)
                                continue;
 
-                       if (g_snprintf(path, MS_FILE_PATH_LEN_MAX, "%s/%s", current_path, dir_entry->d_name) >= MS_FILE_PATH_LEN_MAX) {
+                       if (g_snprintf(path, MAX_FILEPATH_LEN, "%s/%s", current_path, dir_entry->d_name) >= MAX_FILEPATH_LEN) {
                                MS_DBG_ERR("g_snprintf failed");
                                continue;
                        }
@@ -387,7 +387,7 @@ static int __msc_dir_scan_for_storage(sqlite3 *handle, const char *storage_id, c
        int ret = MS_MEDIA_ERR_NONE;
        char *new_path = NULL;
        char *current_path = NULL;
-       char path[MS_FILE_PATH_LEN_MAX] = {0, };
+       char path[MAX_FILEPATH_LEN] = {0, };
        int (*scan_function)(sqlite3 *, const char*, const char*, uid_t) = NULL;
        char *new_start_path = NULL;
 
@@ -496,7 +496,7 @@ static int __msc_dir_scan_for_storage(sqlite3 *handle, const char *storage_id, c
                        if (strcmp(dir_entry->d_name, RECYCLE_DIR_NAME) == 0)
                                continue;
 
-                       if (g_snprintf(path, MS_FILE_PATH_LEN_MAX, "%s/%s", current_path, dir_entry->d_name) >= MS_FILE_PATH_LEN_MAX) {
+                       if (g_snprintf(path, MAX_FILEPATH_LEN, "%s/%s", current_path, dir_entry->d_name) >= MAX_FILEPATH_LEN) {
                                MS_DBG_ERR("g_snprintf failed");
                                continue;
                        }

diff --git a/src/scanner/media-scanner-scan.c b/src/scanner/media-scanner-scan.c
index 92b09fd..faf41d4 100644 (file)
--- a/src/scanner/media-scanner-scan.c
+++ b/src/scanner/media-scanner-scan.c
@@ -49,7 +49,7 @@ static int __msc_dir_scan(sqlite3 *handle, const char *storage_id, char *start_p
        struct dirent64 *dir_entry = NULL;
        GQueue *dir_queue = NULL;
        char *current_path = NULL;
-       char path[MS_FILE_PATH_LEN_MAX] = {0, };
+       char path[MAX_FILEPATH_LEN] = {0, };
        int (*scan_function)(sqlite3 *, const char*, const char*, uid_t) = NULL;
 
        dir_queue = g_queue_new();
@@ -89,7 +89,7 @@ static int __msc_dir_scan(sqlite3 *handle, const char *storage_id, char *start_p
                        if (dir_entry->d_name[0] == '.')
                                continue;
 
-                       snprintf(path, MS_FILE_PATH_LEN_MAX, "%s/%s", current_path, dir_entry->d_name);
+                       snprintf(path, MAX_FILEPATH_LEN, "%s/%s", current_path, dir_entry->d_name);
 
                        switch (dir_entry->d_type) {
                        case DT_REG:

diff --git a/src/server/media-server-socket.c b/src/server/media-server-socket.c
index c9680b4..6dabb52 100644 (file)
--- a/src/server/media-server-socket.c
+++ b/src/server/media-server-socket.c
@@ -21,7 +21,6 @@
 #include <malloc.h>
 
 #include "media-util.h"
-#include "media-util-internal.h"
 #include "media-common-utils.h"
 #include "media-common-db-svc.h"
 #include "media-common-system.h"