X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fmedia_storage.c;h=344cc04d4a4de5f3e53e9e1d0bac649dcc8f3825;hb=5f7f04c6c208926e6eea7a86c2bc3fbddb244d7e;hp=acb72eb135e94290f19e5bb913160a5e222b28d1;hpb=1899ce3e55fad22cabd1fd536a2a75ae3af44210;p=platform%2Fcore%2Fapi%2Fmedia-content.git

diff --git a/src/media_storage.c b/src/media_storage.c
index acb72eb..344cc04 100755
--- a/src/media_storage.c
+++ b/src/media_storage.c
@@ -20,30 +20,21 @@
 int media_storage_get_storage_info_from_db(const char *storage_id, media_storage_h *storage)
 {
 	int ret = MEDIA_CONTENT_ERROR_NONE;
-	media_content_warn("DEPRECATION WARNING: media_storage_get_storage_info_from_db() is deprecated and will be removed from next release.");
+	content_warn("DEPRECATION WARNING: media_storage_get_storage_info_from_db() is deprecated and will be removed from next release.");
 	char select_query[DEFAULT_QUERY_SIZE] = {0, };
 	sqlite3_stmt *stmt = NULL;
 	media_storage_s *_storage = NULL;
 
-	if (!STRING_VALID(storage_id) || (storage == NULL)) {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(STRING_VALID(storage_id));
+	content_retip_if_fail(storage);
 
-	memset(select_query, 0x00, sizeof(select_query));
 	snprintf(select_query, sizeof(select_query), SELECT_STORAGE_INFO_FROM_STORAGE, storage_id);
 
 	ret = _content_get_result(select_query, &stmt);
-	media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
+	content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
 	if (sqlite3_step(stmt) == SQLITE_ROW) {
-		_storage = (media_storage_s*)calloc(1, sizeof(media_storage_s));
-
-		if (_storage == NULL) {
-			media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-			SQLITE3_FINALIZE(stmt);
-			return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-		}
+		_storage = g_new0(media_storage_s, 1);
 
 		_storage->storage_id = g_strdup(storage_id);
 		_storage->storage_path = g_strdup((const char *)sqlite3_column_text(stmt, 0));
@@ -51,7 +42,7 @@ int media_storage_get_storage_info_from_db(const char *storage_id, media_storage
 
 		*storage = (media_storage_h)_storage;
 	} else {
-		media_content_error("Nonexistent storage id[%s]", storage_id);
+		content_error("Nonexistent storage id[%s]", storage_id);
 		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
 	}
 
@@ -62,193 +53,122 @@ int media_storage_get_storage_info_from_db(const char *storage_id, media_storage
 
 int media_storage_get_storage_count_from_db(filter_h filter, int *storage_count)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
-	media_content_warn("DEPRECATION WARNING: media_storage_get_storage_count_from_db() is deprecated and will be removed from next release.");
+	content_warn("DEPRECATION WARNING: media_storage_get_storage_count_from_db() is deprecated and will be removed from next release.");
 
-	if (storage_count) {
-		ret = _media_db_get_group_count(filter, MEDIA_GROUP_STORAGE, storage_count);
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(storage_count);
 
-	return ret;
+	return _media_db_get_group_count(filter, MEDIA_GROUP_STORAGE, storage_count);
 }
 
 int media_storage_foreach_storage_from_db(filter_h filter, media_storage_cb callback, void *user_data)
 {
 	int ret = MEDIA_CONTENT_ERROR_NONE;
-	media_content_warn("DEPRECATION WARNING: media_storage_foreach_storage_from_db() is deprecated and will be removed from next release.");
+	content_warn("DEPRECATION WARNING: media_storage_foreach_storage_from_db() is deprecated and will be removed from next release.");
+
+	content_retip_if_fail(callback);
 
-	if (callback != NULL) {
 #ifdef _USE_TVPD_MODE
 	g_mutex_lock(_content_get_db_mutex());
 #endif
-
-		ret = _media_db_get_storage(filter, callback, user_data);
+	ret = _media_db_get_storage(filter, callback, user_data);
 
 #ifdef _USE_TVPD_MODE
 	g_mutex_unlock(_content_get_db_mutex());
 #endif
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
 
 	return ret;
 }
 
 int media_storage_get_media_count_from_db(const char *storage_id, filter_h filter, int *media_count)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
-	media_content_warn("DEPRECATION WARNING: media_storage_get_media_count_from_db() is deprecated and will be removed from next release.");
+	content_warn("DEPRECATION WARNING: media_storage_get_media_count_from_db() is deprecated and will be removed from next release.");
 
-	if (STRING_VALID(storage_id) && media_count) {
-		ret = _media_db_get_group_item_count(storage_id, filter, MEDIA_GROUP_STORAGE, media_count);
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(STRING_VALID(storage_id));
+	content_retip_if_fail(media_count);
 
-	return ret;
+	return _media_db_get_group_item_count(storage_id, filter, MEDIA_GROUP_STORAGE, media_count);
 }
 
 int media_storage_foreach_media_from_db(const char *storage_id, filter_h filter, media_info_cb callback, void *user_data)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
-	media_content_warn("DEPRECATION WARNING: media_storage_foreach_media_from_db() is deprecated and will be removed from next release.");
+	content_warn("DEPRECATION WARNING: media_storage_foreach_media_from_db() is deprecated and will be removed from next release.");
 
-	if ((callback != NULL) && STRING_VALID(storage_id)) {
-		ret = _media_db_get_group_item(storage_id, filter, callback, user_data, MEDIA_GROUP_STORAGE);
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(STRING_VALID(storage_id));
+	content_retip_if_fail(callback);
 
-	return ret;
+	return _media_db_get_group_item(storage_id, filter, callback, user_data, MEDIA_GROUP_STORAGE);
 }
 
 int media_storage_destroy(media_storage_h storage)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
-	media_content_warn("DEPRECATION WARNING: media_storage_destroy() is deprecated and will be removed from next release.");
+	content_warn("DEPRECATION WARNING: media_storage_destroy() is deprecated and will be removed from next release.");
 	media_storage_s *_storage = (media_storage_s*)storage;
-	if (_storage) {
-		SAFE_FREE(_storage->storage_id);
-		SAFE_FREE(_storage->storage_path);
-		SAFE_FREE(_storage);
 
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(storage);
 
-	return ret;
+	g_free(_storage->storage_id);
+	g_free(_storage->storage_path);
+	g_free(_storage);
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_storage_clone(media_storage_h *dst, media_storage_h src)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
-	media_content_warn("DEPRECATION WARNING: media_storage_clone() is deprecated and will be removed from next release.");
+	content_warn("DEPRECATION WARNING: media_storage_clone() is deprecated and will be removed from next release.");
 	media_storage_s *_src = (media_storage_s*)src;
 
-	if (_src != NULL) {
-		media_storage_s *_dst = (media_storage_s*)calloc(1, sizeof(media_storage_s));
-		media_content_retvm_if(_dst == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
-
-		if (STRING_VALID(_src->storage_id)) {
-			_dst->storage_id = strdup(_src->storage_id);
-			if (_dst->storage_id == NULL) {
-				media_storage_destroy((media_storage_h)_dst);
-				media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-			}
-		}
-
-		if (STRING_VALID(_src->storage_path)) {
-			_dst->storage_path = strdup(_src->storage_path);
-			if (_dst->storage_path == NULL) {
-				media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-				media_storage_destroy((media_storage_h)_dst);
-				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-			}
-		}
-
-		_dst->storage_type = _src->storage_type;
-
-		*dst = (media_storage_h)_dst;
-
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(dst);
+	content_retip_if_fail(src);
 
-	return ret;
+	media_storage_s *_dst = g_new0(media_storage_s, 1);
+
+	_dst->storage_id = g_strdup(_src->storage_id);
+	_dst->storage_path = g_strdup(_src->storage_path);
+	_dst->storage_type = _src->storage_type;
+
+	*dst = (media_storage_h)_dst;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_storage_get_id(media_storage_h storage, char **storage_id)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
-	media_content_warn("DEPRECATION WARNING: media_storage_get_id() is deprecated and will be removed from next release.");
+	content_warn("DEPRECATION WARNING: media_storage_get_id() is deprecated and will be removed from next release.");
 	media_storage_s *_storage = (media_storage_s*)storage;
 
-	if (_storage && storage_id) {
-		if (STRING_VALID(_storage->storage_id)) {
-			*storage_id = strdup(_storage->storage_id);
-			media_content_retvm_if(*storage_id == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
-		} else {
-			*storage_id = NULL;
-		}
+	content_retip_if_fail(storage);
+	content_retip_if_fail(storage_id);
 
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	*storage_id = g_strdup(_storage->storage_id);
 
-	return ret;
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_storage_get_path(media_storage_h storage, char **storage_path)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
-	media_content_warn("DEPRECATION WARNING: media_storage_get_path() is deprecated and will be removed from next release.");
+	content_warn("DEPRECATION WARNING: media_storage_get_path() is deprecated and will be removed from next release.");
 	media_storage_s *_storage = (media_storage_s*)storage;
 
-	if (_storage && storage_path) {
-		if (STRING_VALID(_storage->storage_path)) {
-			*storage_path = strdup(_storage->storage_path);
-			media_content_retvm_if(*storage_path == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
-		} else {
-			*storage_path = NULL;
-		}
+	content_retip_if_fail(storage);
+	content_retip_if_fail(storage_path);
 
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	*storage_path = g_strdup(_storage->storage_path);
 
-	return ret;
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_storage_get_type(media_storage_h storage, media_content_storage_e *storage_type)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
-	media_content_warn("DEPRECATION WARNING: media_storage_get_type() is deprecated and will be removed from next release. Use storage_get_type_dev() instead.");
+	content_warn("DEPRECATION WARNING: media_storage_get_type() is deprecated and will be removed from next release. Use storage_get_type_dev() instead.");
 	media_storage_s *_storage = (media_storage_s*)storage;
 
-	if (_storage && storage_type) {
-		*storage_type = _storage->storage_type;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(storage);
+	content_retip_if_fail(storage_type);
 
-	return ret;
+	*storage_type = _storage->storage_type;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 #ifdef _USE_TVPD_MODE
@@ -257,19 +177,17 @@ int media_storage_get_scan_status(const char *storage_uuid, media_storage_scan_s
 	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_svc_scan_status_type_e status = MEDIA_STORAGE_SCAN_NONE;
 
-	if (STRING_VALID(storage_uuid)) {
-		ret = media_svc_get_storage_scan_status(_content_get_db_handle(), storage_uuid, &status);
-		if (ret != MS_MEDIA_ERR_NONE) {
-			media_content_error("media_svc_get_storage_scan_status failed");
-			ret = _content_error_capi(ret);
-		} else {
-			*scan_status = status;
-		}
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
+	content_retip_if_fail(STRING_VALID(storage_uuid));
+	content_retip_if_fail(scan_status);
+
+	ret = media_svc_get_storage_scan_status(_content_get_db_handle(), storage_uuid, &status);
+	if (ret != MS_MEDIA_ERR_NONE) {
+		content_error("media_svc_get_storage_scan_status failed");
+		return _content_error_capi(ret);
 	}
 
+	*scan_status = status;
+
 	return ret;
 }
 #endif