From 137acb9379c3d3d1884dcec984d2177d1c6b4b57 Mon Sep 17 00:00:00 2001 From: Haejeong Kim Date: Fri, 5 Jun 2015 18:12:01 +0900 Subject: [PATCH] Just code reordering Change-Id: Ic7b08d88357858f4ec75f6aabd936deda25fdd87 --- src/common/media-svc-noti.c | 56 ++++++++++++++++++++++--------------- src/include/common/media-svc-noti.h | 1 - 2 files changed, 33 insertions(+), 24 deletions(-) diff --git a/src/common/media-svc-noti.c b/src/common/media-svc-noti.c index 27e2cdf..6fc5ced 100755 --- a/src/common/media-svc-noti.c +++ b/src/common/media-svc-noti.c @@ -26,6 +26,38 @@ static __thread media_svc_noti_item *g_inserted_noti_list = NULL; static __thread int g_noti_from_pid = -1; +static int __media_svc_publish_noti_by_item(media_svc_noti_item *noti_item) +{ + int ret = MS_MEDIA_ERR_NONE; + + if (noti_item && noti_item->path) + { + ret = media_db_update_send(noti_item->pid, + noti_item->update_item, + noti_item->update_type, + noti_item->path, + noti_item->media_uuid, + noti_item->media_type, + noti_item->mime_type); + if(ret != MS_MEDIA_ERR_NONE) + { + media_svc_error("media_db_update_send failed : %d [%s]", ret, noti_item->path); + ret = MS_MEDIA_ERR_SEND_NOTI_FAIL; + } + else + { + media_svc_debug("media_db_update_send success"); + } + } + else + { + media_svc_debug("invalid path"); + ret = MS_MEDIA_ERR_INVALID_PARAMETER; + } + + return ret; +} + media_svc_noti_item *_media_svc_get_noti_list() { return g_inserted_noti_list; @@ -96,7 +128,7 @@ int _media_svc_publish_noti_list(int all_cnt) if (noti_list) { for (idx = 0; idx < all_cnt; idx++) { - ret = _media_svc_publish_noti_by_item(&(noti_list[idx])); + ret = __media_svc_publish_noti_by_item(&(noti_list[idx])); } } @@ -154,28 +186,6 @@ int _media_svc_destroy_noti_item(media_svc_noti_item *item) return MS_MEDIA_ERR_NONE; } -int _media_svc_publish_noti_by_item(media_svc_noti_item *noti_item) -{ - int err = MS_MEDIA_ERR_NONE; - - if (noti_item && noti_item->path) { - err = media_db_update_send(noti_item->pid, - noti_item->update_item, - noti_item->update_type, - noti_item->path, - noti_item->media_uuid, - noti_item->media_type, - noti_item->mime_type); - if (err < 0) { - media_svc_error("media_db_update_send failed : %d [%s]", err, noti_item->path); - } else { - media_svc_debug("media_db_update_send success"); - } - } - - return err; -} - int _media_svc_publish_noti(media_item_type_e update_item, media_item_update_type_e update_type, const char *path, diff --git a/src/include/common/media-svc-noti.h b/src/include/common/media-svc-noti.h index 464ce05..def2dab 100755 --- a/src/include/common/media-svc-noti.h +++ b/src/include/common/media-svc-noti.h @@ -54,7 +54,6 @@ int _media_svc_create_noti_item(media_svc_content_info_s *content_info, #endif int _media_svc_destroy_noti_item(media_svc_noti_item *item); -int _media_svc_publish_noti_by_item(media_svc_noti_item *noti_item); int _media_svc_publish_noti(media_item_type_e update_item, media_item_update_type_e update_type, -- 2.7.4