X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fmedia_folder.c;h=04e63bb484337ece65b5ca5bfe97a2894cee43bb;hb=refs%2Ftags%2Fsubmit%2Ftizen%2F20200705.232724;hp=ac44f49d4f53cad7ef52ecae7cf1dd0e822de9b7;hpb=34ef3e3cd4a841e93e7d8e718b6af70fe773a247;p=platform%2Fcore%2Fapi%2Fmedia-content.git

diff --git a/src/media_folder.c b/src/media_folder.c
index ac44f49..04e63bb 100755
--- a/src/media_folder.c
+++ b/src/media_folder.c
@@ -29,10 +29,8 @@ int media_folder_get_folder_count_from_db(filter_h filter, int *folder_count)
 {
 	int ret = MEDIA_CONTENT_ERROR_NONE;
 
-	if (!folder_count) {
-		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(folder_count);
+
 #ifdef _USE_TVPD_MODE
 	g_mutex_lock(_content_get_db_mutex());
 #endif
@@ -51,10 +49,7 @@ int media_folder_foreach_folder_from_db(filter_h filter, media_folder_cb callbac
 {
 	int ret = MEDIA_CONTENT_ERROR_NONE;
 
-	if (callback == NULL) {
-		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(callback);
 
 #ifdef _USE_TVPD_MODE
 	g_mutex_lock(_content_get_db_mutex());
@@ -73,22 +68,19 @@ int media_folder_get_media_count_from_db(const char *folder_id, filter_h filter,
 {
 	int ret = MEDIA_CONTENT_ERROR_NONE;
 
-	if (STRING_VALID(folder_id) && media_count) {
+	content_retip_if_fail(STRING_VALID(folder_id));
+	content_retip_if_fail(media_count);
+
 #ifdef _USE_TVPD_MODE
-		g_mutex_lock(_content_get_db_mutex());
+	g_mutex_lock(_content_get_db_mutex());
 #endif
 
-		ret = _media_db_get_group_item_count(folder_id, filter, MEDIA_GROUP_FOLDER, media_count);
+	ret = _media_db_get_group_item_count(folder_id, filter, MEDIA_GROUP_FOLDER, media_count);
 
 #ifdef _USE_TVPD_MODE
-		g_mutex_unlock(_content_get_db_mutex());
+	g_mutex_unlock(_content_get_db_mutex());
 #endif
 
-	} else {
-		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
-
 	return ret;
 }
 
@@ -96,248 +88,135 @@ int media_folder_foreach_media_from_db(const char *folder_id, filter_h filter, m
 {
 	int ret = MEDIA_CONTENT_ERROR_NONE;
 
-	if ((callback != NULL) && STRING_VALID(folder_id)) {
+	content_retip_if_fail(STRING_VALID(folder_id));
+	content_retip_if_fail(callback);
+
 #ifdef _USE_TVPD_MODE
-		g_mutex_lock(_content_get_db_mutex());
+	g_mutex_lock(_content_get_db_mutex());
 #endif
 
-		ret = _media_db_get_group_item(folder_id, filter, callback, user_data, MEDIA_GROUP_FOLDER);
+	ret = _media_db_get_group_item(folder_id, filter, callback, user_data, MEDIA_GROUP_FOLDER);
 
 #ifdef _USE_TVPD_MODE
-		g_mutex_unlock(_content_get_db_mutex());
+	g_mutex_unlock(_content_get_db_mutex());
 #endif
 
-	} else {
-		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
-
 	return ret;
 }
 
-#ifdef _USE_SENIOR_MODE
-int media_folder_foreach_media_from_db_by_union_select(const char* folder_id, filter_h filter1, filter_h filter2, media_info_cb callback, void* user_data)
-{
-	int ret = MEDIA_CONTENT_ERROR_NONE;
-
-	if ((callback != NULL) && STRING_VALID(folder_id)) {
-		ret = _media_db_get_group_item_by_union_select(folder_id, filter1, filter2, callback, user_data);
-	} else {
-		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
-
-	return ret;
-}
-#endif
-
 int media_folder_destroy(media_folder_h folder)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_folder_s *_folder = (media_folder_s*)folder;
-	if (_folder) {
-		SAFE_FREE(_folder->path);
-		SAFE_FREE(_folder->name);
-		SAFE_FREE(_folder->folder_id);
-		SAFE_FREE(_folder->storage_uuid);
-		SAFE_FREE(_folder);
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
 
-	return ret;
+	content_retip_if_fail(folder);
+
+	g_free(_folder->path);
+	g_free(_folder->name);
+	g_free(_folder->folder_id);
+	g_free(_folder->storage_uuid);
+	g_free(_folder);
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 int media_folder_clone(media_folder_h *dst, media_folder_h src)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_folder_s *_src = (media_folder_s*)src;
 
-	if (_src != NULL) {
-		media_folder_s *_dst = (media_folder_s*)calloc(1, sizeof(media_folder_s));
-		content_retvm_if(_dst == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
-
-		if (STRING_VALID(_src->folder_id)) {
-			_dst->folder_id = strdup(_src->folder_id);
-			if (_dst->folder_id == NULL) {
-				SAFE_FREE(_dst);
-				content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-			}
-		}
-
-		if (STRING_VALID(_src->name)) {
-			_dst->name = strdup(_src->name);
-			if (_dst->name == NULL) {
-				content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-				media_folder_destroy((media_folder_h)_dst);
-				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-			}
-		}
-
-		if (STRING_VALID(_src->path)) {
-			_dst->path = strdup(_src->path);
-			if (_dst->path == NULL) {
-				content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-				media_folder_destroy((media_folder_h)_dst);
-				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-			}
-		}
-
-		if (STRING_VALID(_src->storage_uuid)) {
-			_dst->storage_uuid = strdup(_src->storage_uuid);
-			if (_dst->storage_uuid == NULL) {
-				content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-				media_folder_destroy((media_folder_h)_dst);
-				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-			}
-		}
+	content_retip_if_fail(dst);
+	content_retip_if_fail(src);
 
-		_dst->storage_type = _src->storage_type;
+	media_folder_s *_dst = g_new0(media_folder_s, 1);
 
-		*dst = (media_folder_h)_dst;
+	_dst->folder_id = g_strdup(_src->folder_id);
+	_dst->name = g_strdup(_src->name);
+	_dst->path = g_strdup(_src->path);
+	_dst->storage_uuid = g_strdup(_src->storage_uuid);
+	_dst->storage_type = _src->storage_type;
 
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	*dst = (media_folder_h)_dst;
 
-	return ret;
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_folder_get_folder_id(media_folder_h folder, char **folder_id)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_folder_s *_folder = (media_folder_s*)folder;
 
-	if (_folder) {
-		if (STRING_VALID(_folder->folder_id)) {
-			*folder_id = strdup(_folder->folder_id);
-			content_retvm_if(*folder_id == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
-		} else {
-			*folder_id = NULL;
-		}
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(folder);
+	content_retip_if_fail(folder_id);
 
-	return ret;
+	*folder_id = g_strdup(_folder->folder_id);
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_folder_get_path(media_folder_h folder, char **path)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_folder_s *_folder = (media_folder_s*)folder;
 
-	if (_folder) {
-		if (STRING_VALID(_folder->path)) {
-			*path = strdup(_folder->path);
-			content_retvm_if(*path == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
-		} else {
-			*path = NULL;
-		}
-		ret = MEDIA_CONTENT_ERROR_NONE;
+	content_retip_if_fail(folder);
+	content_retip_if_fail(path);
 
-	} else {
-		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
-
-	return ret;
+	*path = g_strdup(_folder->path);
 
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_folder_get_name(media_folder_h folder, char **name)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_folder_s *_folder = (media_folder_s*)folder;
 
-	if (_folder) {
-		if (STRING_VALID(_folder->name)) {
-			*name = strdup(_folder->name);
-			content_retvm_if(*name == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
-		} else {
-			*name = NULL;
-		}
-		ret = MEDIA_CONTENT_ERROR_NONE;
+	content_retip_if_fail(folder);
+	content_retip_if_fail(name);
 
-	} else {
-		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	*name = g_strdup(_folder->name);
 
-	return ret;
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_folder_get_storage_type(media_folder_h folder, media_content_storage_e* storage_type)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	content_warn("DEPRECATION WARNING: media_folder_get_storage_type() is deprecated and will be removed from next release. Use storage_get_type_dev() instead.");
 	media_folder_s *_folder = (media_folder_s*)folder;
 
-	if (_folder) {
-		*storage_type = _folder->storage_type;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(folder);
+	content_retip_if_fail(storage_type);
 
-	return ret;
+	*storage_type = _folder->storage_type;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_folder_get_storage_id(media_folder_h folder, char **storage_id)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	content_warn("DEPRECATION WARNING: media_folder_get_storage_id() is deprecated and will be removed from next release.");
 	media_folder_s *_folder = (media_folder_s*)folder;
 
-	if (_folder) {
-		if (STRING_VALID(_folder->storage_uuid)) {
-			*storage_id = strdup(_folder->storage_uuid);
-			content_retvm_if(*storage_id == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
-		} else {
-			*storage_id = NULL;
-		}
-		ret = MEDIA_CONTENT_ERROR_NONE;
+	content_retip_if_fail(folder);
+	content_retip_if_fail(storage_id);
 
-	} else {
-		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	*storage_id = g_strdup(_folder->storage_uuid);
 
-	return ret;
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_folder_get_folder_from_db(const char *folder_id, media_folder_h *folder)
 {
 	int ret = MEDIA_CONTENT_ERROR_NONE;
 	sqlite3_stmt *stmt = NULL;
-	char select_query[DEFAULT_QUERY_SIZE];
+	char select_query[DEFAULT_QUERY_SIZE] = {0, };
 	media_folder_s *_folder = NULL;
 
-	if (!STRING_VALID(folder_id)) {
-		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(STRING_VALID(folder_id));
+	content_retip_if_fail(folder);
 
-	memset(select_query, 0x00, sizeof(select_query));
 	snprintf(select_query, sizeof(select_query), SELECT_FOLDER_FROM_FOLDER, folder_id);
 
 	ret = _content_get_result(select_query, &stmt);
 	content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
 	if (sqlite3_step(stmt) == SQLITE_ROW) {
-		_folder = (media_folder_s*)calloc(1, sizeof(media_folder_s));
-		if (_folder == NULL) {
-			content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-			SQLITE3_FINALIZE(stmt);
-			return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-		}
+		_folder = g_new0(media_folder_s, 1);
 
 		_folder->folder_id = g_strdup(folder_id);
 		_folder->path = g_strdup((const char *)sqlite3_column_text(stmt, 0));
@@ -360,24 +239,22 @@ int media_folder_update_to_db(media_folder_h folder)
 	media_folder_s *_folder = (media_folder_s*)folder;
 	char repl_path[MAX_PATH_LEN] = {0, };
 
-	if ((_folder == NULL) || (_folder->folder_id == NULL)) {
-		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(folder);
+	content_retip_if_fail(STRING_VALID(_folder->folder_id));
 
-	if (STRING_VALID(_folder->folder_id) && g_src_path) {
-		ret = _media_content_replace_path(_folder->path, repl_path);
-		if (ret != MEDIA_CONTENT_ERROR_NONE) {
-			SAFE_FREE(g_src_path);
-			return ret;
-		}
-		ret = media_svc_rename_folder(_content_get_db_handle(), _folder->storage_uuid, g_src_path, repl_path, _content_get_uid());
-		SAFE_FREE(g_src_path);
+	if (!g_src_path)
+		return ret;
 
-		return _content_error_capi(ret);
+
+	ret = _media_content_replace_path(_folder->path, repl_path);
+	if (ret != MEDIA_CONTENT_ERROR_NONE) {
+		SAFE_FREE(g_src_path);
+		return ret;
 	}
+	ret = media_svc_rename_folder(_content_get_db_handle(), _folder->storage_uuid, g_src_path, repl_path, _content_get_uid());
+	SAFE_FREE(g_src_path);
 
-	return ret;
+	return _content_error_capi(ret);
 }
 
 int media_folder_set_name(media_folder_h folder, const char *name)
@@ -386,52 +263,45 @@ int media_folder_set_name(media_folder_h folder, const char *name)
 	content_warn("DEPRECATION WARNING: media_folder_set_name() is deprecated and will be removed from next release.");
 	media_folder_s *_folder = (media_folder_s*)folder;
 
-	if (_folder != NULL && STRING_VALID(name) && name[0] != '.') {
-		if (STRING_VALID(_folder->path) && STRING_VALID(_folder->name)) {
-			char *folder_path = NULL;
-			char new_folder_path[MAX_PATH_LEN] = {0,};
-			char repl_path[MAX_PATH_LEN] = {0, };
-
-			memset(repl_path, 0, sizeof(repl_path));
-			ret = _media_content_replace_path(_folder->path, repl_path);
-			content_retvm_if(!STRING_VALID(repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed");
-
-			folder_path = g_path_get_dirname(repl_path);
-			content_sec_debug("Existed Folder Path : %s", repl_path);
-			snprintf(new_folder_path, sizeof(new_folder_path), "%s/%s", folder_path, name);
-			content_sec_debug("New Path : %s", new_folder_path);
-
-			SAFE_FREE(g_src_path);
-			g_src_path = strdup(repl_path);
-
-			SAFE_FREE(_folder->path);
-			SAFE_FREE(_folder->name);
-			SAFE_FREE(folder_path);
-
-			_folder->path = strdup(new_folder_path);
-			content_retvm_if(_folder->path == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
-			_folder->name = strdup(name);
-			content_retvm_if(_folder->name == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
-		} else {
-			content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-			ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-		}
-	} else {
-		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	char *folder_path = NULL;
+	char new_folder_path[MAX_PATH_LEN] = {0,};
+	char repl_path[MAX_PATH_LEN] = {0, };
+
+	content_retip_if_fail(folder);
+	content_retip_if_fail(STRING_VALID(name));
+	content_retip_if_fail(name[0] != '.');
+	content_retip_if_fail(STRING_VALID(_folder->path));
+	content_retip_if_fail(STRING_VALID(_folder->name));
+
+	ret = _media_content_replace_path(_folder->path, repl_path);
+	content_retvm_if(!STRING_VALID(repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed");
+
+	folder_path = g_path_get_dirname(repl_path);
+	content_sec_debug("Existed Folder Path : %s", repl_path);
+	snprintf(new_folder_path, sizeof(new_folder_path), "%s/%s", folder_path, name);
+	content_sec_debug("New Path : %s", new_folder_path);
+
+	g_free(g_src_path);
+	g_src_path = g_strdup(repl_path);
+
+	g_free(_folder->path);
+	g_free(_folder->name);
+	g_free(folder_path);
+
+	_folder->path = g_strdup(new_folder_path);
+	_folder->name = g_strdup(name);
 
 	return ret;
 }
 
 int media_folder_insert_to_db(const char *path)
 {
-	char repl_path[MAX_PATH_LEN] = {0, };
 	int ret = MEDIA_CONTENT_ERROR_NONE;
+	char repl_path[MAX_PATH_LEN] = {0, };
 	char storage_id[MEDIA_CONTENT_UUID_SIZE+1] = {0, };
 
-	content_retvm_if(!STRING_VALID(path), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid path");
-	memset(repl_path, 0, sizeof(repl_path));
+	content_retip_if_fail(STRING_VALID(path));
+
 	ret = _media_content_replace_path(path, repl_path);
 	content_retvm_if(!STRING_VALID(repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed");
 
@@ -458,7 +328,7 @@ int media_folder_insert_to_db(const char *path)
 			return _content_error_capi(ret);
 		}
 
-		ret = media_svc_insert_folder(_content_get_db_handle(), storage_id, storage_type, repl_path, _content_get_uid());
+		ret = media_svc_insert_folder(_content_get_db_handle(), storage_id, storage_type, repl_path, false, _content_get_uid());
 		if (ret != MS_MEDIA_ERR_NONE) {
 			if (ret == MS_MEDIA_ERR_DB_CONSTRAINT_FAIL) {
 				content_sec_error("This item is already inserted. This may be normal operation because other process already did this (%s)", repl_path);
@@ -470,7 +340,7 @@ int media_folder_insert_to_db(const char *path)
 			return _content_error_capi(ret);
 		}
 
-		ret = media_svc_set_folder_scan_status(storage_id, repl_path, MEDIA_DIR_SCAN_DONE, _content_get_uid());
+		ret = media_svc_set_folder_scan_status(storage_id, repl_path, MEDIA_DIR_SCAN_DONE, false, _content_get_uid());
 		if (ret != MS_MEDIA_ERR_NONE) {
 			content_sec_error("ms_set_folder_scan_status failed : %d", ret);
 			return _content_error_capi(ret);
@@ -488,17 +358,16 @@ int media_folder_get_scan_status(const char *storage_uuid, char* path, media_fol
 	int ret = MEDIA_CONTENT_ERROR_NONE;
 	int status = MEDIA_DIR_SCAN_NONE;
 
-	if (STRING_VALID(storage_uuid) && STRING_VALID(path)) {
-		ret = media_svc_get_folder_scan_status(_content_get_db_handle(), storage_uuid, path, &status);
-		if (ret != MS_MEDIA_ERR_NONE) {
-			content_error("media_svc_get_folder_scan_status failed");
-			ret = _content_error_capi(ret);
-		} else {
-			*scan_status = status;
-		}
+	content_retip_if_fail(STRING_VALID(storage_uuid));
+	content_retip_if_fail(STRING_VALID(path));
+	content_retip_if_fail(scan_status);
+
+	ret = media_svc_get_folder_scan_status(_content_get_db_handle(), storage_uuid, path, &status);
+	if (ret != MS_MEDIA_ERR_NONE) {
+		content_error("media_svc_get_folder_scan_status failed");
+		ret = _content_error_capi(ret);
 	} else {
-		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
+		*scan_status = status;
 	}
 
 	return ret;
@@ -507,22 +376,19 @@ int media_folder_get_scan_status(const char *storage_uuid, char* path, media_fol
 int media_folder_reset_scan_status(const char *storage_uuid, const char* path)
 {
 	int ret = MEDIA_CONTENT_ERROR_NONE;
-	if (STRING_VALID(path)) {
-		ret = media_svc_set_folder_validity(FALSE, storage_uuid, path, 0, TRUE, _content_get_uid());
-		if (ret != MS_MEDIA_ERR_NONE) {
-			content_error("set folder validity failed");
-			ret = _content_error_capi(ret);
-			return ret;
-		}
 
-		ret = media_svc_set_folder_scan_status(storage_uuid, path, MEDIA_DIR_SCAN_NONE, _content_get_uid());
-		if (ret != MS_MEDIA_ERR_NONE) {
-			content_error("media_folder_reset_scan_status failed");
-			ret = _content_error_capi(ret);
-		}
-	} else {
-		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
+	content_retip_if_fail(STRING_VALID(path));
+
+	ret = media_svc_set_folder_validity(FALSE, storage_uuid, path, 0, TRUE, _content_get_uid());
+	if (ret != MS_MEDIA_ERR_NONE) {
+		content_error("set folder validity failed");
+		return _content_error_capi(ret);
+	}
+
+	ret = media_svc_set_folder_scan_status(storage_uuid, path, MEDIA_DIR_SCAN_NONE, false, _content_get_uid());
+	if (ret != MS_MEDIA_ERR_NONE) {
+		content_error("media_folder_reset_scan_status failed");
+		return _content_error_capi(ret);
 	}
 
 	return ret;