[content] fixed warnings

[content] removed unused variables from WorkThread (content_instance.cc)
[content] removed unused variable from ContentInstance::ContentManagerCreatPlaylist
[content] added checking of returned values from media_folder_* functions in FolderToJson (content_manager.cc)
[content] fixed unsigned with signed int comparison warning in ContentManager::playlistRemovebatch
[content] fixed unsigned with signed int comparisons warning in ContentManager::playlistSetOrder
[content] added checking of returned value from media_playlist_get_media_count_from_db in ContentManager::playlistSetOrder
[content] removed unused function int get_utc_offset() (content_manager.cc)

Change-Id: Ia274e4542930099a2aaea77c0f0f9d14bdce6053
Signed-off-by: Maciej Kulawik <m.kulawik@samsung.com>
(cherry picked from commit 62bd07282eabe60f9347f00b69610517081f6e53)

diff --git a/src/content/content_instance.cc b/src/content/content_instance.cc
index 371385c..ada665e 100755 (executable)
--- a/src/content/content_instance.cc
+++ b/src/content/content_instance.cc
@@ -376,7 +376,6 @@ void ContentInstance::ContentManagerCreateplaylist(const picojson::value& args,
   CHECK_EXIST(args, "name", out)
 
   double callbackId = args.get("callbackId").get<double>();
-  const std::string& name = args.get("name").get<std::string>();
 
   auto cbData = std::shared_ptr<ReplyCallbackData>(new ReplyCallbackData);
   cbData->callbackId = callbackId;

diff --git a/src/content/content_manager.cc b/src/content/content_manager.cc
index 072d048..a4556d4 100755 (executable)
--- a/src/content/content_manager.cc
+++ b/src/content/content_manager.cc
@@ -437,11 +437,48 @@ static void FolderToJson(media_folder_h folder, picojson::object* out) {
   time_t date;
   media_content_storage_e storageType;
 
-  media_folder_get_folder_id(folder, &id);
-  media_folder_get_name(folder, &name);
-  media_folder_get_path(folder, &path);
-  media_folder_get_modified_time(folder, &date);
-  media_folder_get_storage_type(folder, &storageType);
+  int ret;
+
+  ret = media_folder_get_folder_id(folder, &id);
+  if(ret!=MEDIA_CONTENT_ERROR_NONE)
+  {
+    LoggerE("Failed: media_folder_get_folder_id");
+    common::tools::ReportError(ContentManager::convertError(ret), out);
+    return;
+  }
+
+  ret = media_folder_get_name(folder, &name);
+  if(ret!=MEDIA_CONTENT_ERROR_NONE)
+  {
+    LoggerE("Failed: media_folder_get_name");
+    common::tools::ReportError(ContentManager::convertError(ret), out);
+    return;
+  }
+
+  ret = media_folder_get_path(folder, &path);
+  if(ret!=MEDIA_CONTENT_ERROR_NONE)
+  {
+    LoggerE("Failed: media_folder_get_path");
+    common::tools::ReportError(ContentManager::convertError(ret), out);
+    return;
+  }
+
+  ret = media_folder_get_modified_time(folder, &date);
+  if(ret!=MEDIA_CONTENT_ERROR_NONE)
+  {
+    LoggerE("Failed: media_folder_get_path");
+    common::tools::ReportError(ContentManager::convertError(ret), out);
+    return;
+  }
+
+  ret = media_folder_get_storage_type(folder, &storageType);
+  if(ret!=MEDIA_CONTENT_ERROR_NONE)
+  {
+    LoggerE("Failed: media_folder_get_storage_type");
+    common::tools::ReportError(ContentManager::convertError(ret), out);
+    return;
+  }
+
 
   (*out)["id"] = picojson::value(std::string(id));
   (*out)["directoryURI"] = picojson::value(std::string(path));
@@ -1027,8 +1064,8 @@ void ContentManager::playlistRemovebatch(const std::shared_ptr<ReplyCallbackData
   }
 
   std::vector<picojson::value> members = user_data->args.get("members").get<picojson::array>();
-  size_t members_size = members.size();
-  for( size_t i = 0; i < members_size; i++ ) {
+  std::size_t members_size = members.size();
+  for (std::size_t i = 0; i < members_size; ++i) {
     int member_id = static_cast<int>(members.at(i).get<double>());
     ret = media_playlist_remove_media(playlist, member_id);
 
@@ -1068,9 +1105,16 @@ void ContentManager::playlistSetOrder(const std::shared_ptr<ReplyCallbackData>&
   std::vector<picojson::value> members = user_data->args.get("members").get<picojson::array>();
 
   ret = media_playlist_get_media_count_from_db(std::stoi(playlist_id), NULL, &cnt);
-
-  size_t members_size = members.size();
-  if ( (size_t) cnt != members_size ) {
+  if(ret != MEDIA_CONTENT_ERROR_NONE)
+  {
+    LoggerE("Failed: media_playlist_get_media_count_from_db");
+    PlatformResult err = convertError(ret);
+    user_data->isSuccess = false;
+    user_data->result = err.ToJSON();
+    return;
+  }
+  std::size_t members_size = members.size();
+  if (cnt < 0 || static_cast<size_t>(cnt) != members_size ) {
     LoggerE("Failed: The items array does not contain all items from the playlist");
     PlatformResult err(ErrorCode::INVALID_VALUES_ERR, "The items array does not contain all items from the playlist.");
     user_data->isSuccess = false;
@@ -1078,7 +1122,7 @@ void ContentManager::playlistSetOrder(const std::shared_ptr<ReplyCallbackData>&
     return;
   }
 
-  for( size_t i = 0; i < members_size; i++ ) {
+  for (std::size_t i = 0; i < members_size; ++i) {
     int member_id = static_cast<int>(members.at(i).get<double>());
     ret = media_playlist_set_play_order(playlist, member_id, i);
     if (ret != MEDIA_CONTENT_ERROR_NONE) {
@@ -1391,4 +1435,3 @@ PlatformResult ContentManager::convertError(int err) {
 
 } // namespace content
 } // namespace extension
-

diff --git a/src/content/content_manager.h b/src/content/content_manager.h
index 543c0fe..948d06d 100755 (executable)
--- a/src/content/content_manager.h
+++ b/src/content/content_manager.h
@@ -73,7 +73,7 @@ class ContentManager {
   int setThumbnailUri(int id, const std::string& thb_uri);
 
 //playlistSetOrder
-  common::PlatformResult convertError(int err);
+  static common::PlatformResult convertError(int err);
  private:
   //int setContent(media_info_h media, picojson::value content);
   ContentManager();