Removing warnings from module: content.

Using cppcheck (with --enable=all flag).

[Verification] TCT result:
Before: 100.00%
After:  100.00%

Change-Id: I97a5d33a7ac5cb2b2adeee0cdfbe36c5f8f7f989
Signed-off-by: Anna Niznik <a.niznik@samsung.com>
Signed-off-by: Pawel Sikorski <p.sikorski@samsung.com>

diff --git a/src/content/content_filter.cc b/src/content/content_filter.cc
index 0d502b2fec3ac62db047da3e880f38cc1d907080..bb0f558fa36f680c617a11a22ad36bab10e8c8b7 100755 (executable)
--- a/src/content/content_filter.cc
+++ b/src/content/content_filter.cc
@@ -105,12 +105,11 @@ PlatformResult ContentFilter::BuildQuery(const picojson::object& jsFilter,
                                    const picojson::value& match_value) {
     LoggerD("entered OnAttributeFilter");
 
-    PlatformResult result = PlatformResult(ErrorCode::NO_ERROR);
 
     std::string query;
     std::string matchValue;
 
-    result = MapField(name, &query);
+    PlatformResult result = MapField(name, &query);
     if (!result)
       return result;
 
@@ -212,10 +211,9 @@ PlatformResult ContentFilter::BuildQuery(const picojson::object& jsFilter,
                                         const picojson::value& end_value) {
     LoggerD("entered OnAttributeFilter");
 
-    PlatformResult result = PlatformResult(ErrorCode::NO_ERROR);
     std::string query = "";
     std::string paramName;
-    result = MapField(name, &paramName);
+    PlatformResult result = MapField(name, &paramName);
     if (!result)
       return result;
 

diff --git a/src/content/content_instance.cc b/src/content/content_instance.cc
index e0c3fe11a8a29fbccb5b45e1e98d2a2e7d52ed20..5f1649f0a5982b9412ba15657543e99501509e40 100755 (executable)
--- a/src/content/content_instance.cc
+++ b/src/content/content_instance.cc
@@ -282,9 +282,8 @@ static void changedContentCallback(media_content_error_e error,
 
 void ContentInstance::ContentManagerUpdate(const picojson::value& args, picojson::object& out) {
   LoggerD("entered");
-  int ret;
   if (ContentManager::getInstance()->isConnected()) {
-    ret = ContentManager::getInstance()->update(args);
+    int ret = ContentManager::getInstance()->update(args);
     if (ret != 0) {
       LoggerE("Failed: ContentManager::getInstance()");
       ReportError(ContentManager::getInstance()->convertError(ret), &out);
@@ -493,11 +492,10 @@ void ContentInstance::ContentManagerRemoveplaylist(const picojson::value& args,
 
 void ContentInstance::ContentManagerPlaylistAdd(const picojson::value& args, picojson::object& out) {
   LoggerD("entered");
-  int ret;
   if(ContentManager::getInstance()->isConnected()) {
     std::string playlist_id = args.get("playlistId").get<std::string>();
     std::string content_id = args.get("contentId").get<std::string>();
-    ret = ContentManager::getInstance()->playlistAdd(playlist_id, content_id);
+    int ret = ContentManager::getInstance()->playlistAdd(playlist_id, content_id);
     if(ret != MEDIA_CONTENT_ERROR_NONE) {
       ReportError(ContentManager::getInstance()->convertError(ret),&out);
     }
@@ -546,11 +544,10 @@ void ContentInstance::ContentManagerPlaylistGet(const picojson::value& args, pic
 
 void ContentInstance::ContentManagerPlaylistRemove(const picojson::value& args, picojson::object& out) {
   LoggerD("entered");
-  int ret;
   if(ContentManager::getInstance()->isConnected()) {
     std::string playlist_id = args.get("playlistId").get<std::string>();
     int member_id = args.get("memberId").get<double>();
-    ret = ContentManager::getInstance()->playlistRemove(playlist_id, member_id);
+    int ret = ContentManager::getInstance()->playlistRemove(playlist_id, member_id);
     if(ret != MEDIA_CONTENT_ERROR_NONE) {
       ReportError(ContentManager::getInstance()->convertError(ret),&out);
     }
@@ -620,10 +617,9 @@ void ContentInstance::ContentManagerAudioGetLyrics(const picojson::value& args,
   LoggerD("entered");
   LOGGER(DEBUG) << "entered";
 
-  int ret;
   picojson::object lyrics;
   if (ContentManager::getInstance()->isConnected()) {
-    ret = ContentManager::getInstance()->getLyrics(args, lyrics);
+    int ret = ContentManager::getInstance()->getLyrics(args, lyrics);
     if (ret != MEDIA_CONTENT_ERROR_NONE) {
       ReportError(ContentManager::getInstance()->convertError(ret), &out);
     } else {

diff --git a/src/content/content_manager.cc b/src/content/content_manager.cc
index 80346209952e59ac67fc9198be888b0c265144e8..60fcafd06672da7ca8075cce6f33852acdedbaa3 100755 (executable)
--- a/src/content/content_manager.cc
+++ b/src/content/content_manager.cc
@@ -106,11 +106,9 @@ void ContentToJson(media_info_h info, picojson::object& o) {
         o["height"] = picojson::value(static_cast<double>(tmpInt));
       }
       picojson::object geo;
-      std::string str_latitude;
       if (MEDIA_CONTENT_ERROR_NONE == media_info_get_latitude(info, &tmpDouble)) {
         geo["latitude"] = picojson::value(tmpDouble);
       }
-      std::string str_longitude;
       if (MEDIA_CONTENT_ERROR_NONE == media_info_get_longitude(info, &tmpDouble)) {
         geo["longitude"] = picojson::value(tmpDouble);
       }
@@ -971,7 +969,7 @@ int ContentManager::updateBatch(picojson::value args) {
   int ret = 0;
   std::vector<picojson::value> contents = args.get("contents").get<picojson::array>();
 
-  for (picojson::value::array::iterator it = contents.begin(); it != contents.end(); it++) {
+  for (picojson::value::array::iterator it = contents.begin(); it != contents.end(); ++it) {
     picojson::value content = *it;
     std::string id = content.get("id").to_str();
     media_info_h media = NULL;
@@ -988,10 +986,9 @@ int ContentManager::updateBatch(picojson::value args) {
 
 int ContentManager::playlistAdd(std::string playlist_id, std::string content_id) {
   LoggerD("Enter");
-  int ret = MEDIA_CONTENT_ERROR_NONE;
 
   media_playlist_h playlist = NULL;
-  ret = media_playlist_get_playlist_from_db(std::stoi(playlist_id), &playlist);
+  int ret = media_playlist_get_playlist_from_db(std::stoi(playlist_id), &playlist);
 
   if (playlist != NULL && ret == MEDIA_CONTENT_ERROR_NONE) {
     ret = media_playlist_add_media(playlist, content_id.c_str());
@@ -1014,10 +1011,9 @@ int ContentManager::playlistAdd(std::string playlist_id, std::string content_id)
 
 int ContentManager::playlistRemove(std::string playlist_id, int member_id) {
   LoggerD("Enter");
-  int ret = MEDIA_CONTENT_ERROR_NONE;
 
   media_playlist_h playlist = NULL;
-  ret = media_playlist_get_playlist_from_db(std::stoi(playlist_id), &playlist);
+  int ret = media_playlist_get_playlist_from_db(std::stoi(playlist_id), &playlist);
   if (playlist != NULL && ret == MEDIA_CONTENT_ERROR_NONE) {
     ret = media_playlist_remove_media(playlist, member_id);
     if (ret != MEDIA_CONTENT_ERROR_NONE) {
@@ -1041,11 +1037,10 @@ int ContentManager::playlistRemove(std::string playlist_id, int member_id) {
 void ContentManager::playlistAddbatch(const std::shared_ptr<ReplyCallbackData>& user_data) {
 
   LoggerD("Enter");
-  int ret = MEDIA_CONTENT_ERROR_NONE;
   std::string playlist_id = user_data->args.get("playlistId").get<std::string>();
 
   media_playlist_h playlist = NULL;
-  ret = media_playlist_get_playlist_from_db(std::stoi(playlist_id), &playlist);
+  int ret = media_playlist_get_playlist_from_db(std::stoi(playlist_id), &playlist);
 
   if(ret != MEDIA_CONTENT_ERROR_NONE && playlist == NULL) {
     PlatformResult err(ErrorCode::UNKNOWN_ERR, "Getting playlist is failed.");
@@ -1054,7 +1049,7 @@ void ContentManager::playlistAddbatch(const std::shared_ptr<ReplyCallbackData>&
   }
 
   std::vector<picojson::value> contents = user_data->args.get("contents").get<picojson::array>();
-  for (picojson::value::array::iterator it = contents.begin(); it != contents.end(); it++) {
+  for (picojson::value::array::iterator it = contents.begin(); it != contents.end(); ++it) {
     picojson::value content = *it;
     std::string id = content.get("id").to_str();
     ret = media_playlist_add_media(playlist, id.c_str());
@@ -1074,13 +1069,12 @@ void ContentManager::playlistAddbatch(const std::shared_ptr<ReplyCallbackData>&
 void ContentManager::playlistGet(const std::shared_ptr<ReplyCallbackData>& user_data) {
 
   LoggerD("Enter");
-  int ret = MEDIA_CONTENT_ERROR_NONE;
   media_playlist_h playlist = NULL;
   media_content_order_e order = MEDIA_CONTENT_ORDER_ASC;
   const std::string playOrder("play_order");
 
   std::string playlist_id = user_data->args.get("playlistId").get<std::string>();
-  ret = media_playlist_get_playlist_from_db(std::stoi(playlist_id), &playlist);
+  int ret = media_playlist_get_playlist_from_db(std::stoi(playlist_id), &playlist);
   if(ret != MEDIA_CONTENT_ERROR_NONE && playlist == NULL) {
     LoggerE("Failed: Getting playlist is failed");
     PlatformResult err(ErrorCode::UNKNOWN_ERR, "Getting playlist is failed.");
@@ -1126,11 +1120,10 @@ void ContentManager::playlistGet(const std::shared_ptr<ReplyCallbackData>& user_
 void ContentManager::playlistRemovebatch(const std::shared_ptr<ReplyCallbackData>& user_data) {
 
   LoggerD("Enter");
-  int ret = MEDIA_CONTENT_ERROR_NONE;
   media_playlist_h playlist = NULL;
 
   std::string playlist_id = user_data->args.get("playlistId").get<std::string>();
-  ret = media_playlist_get_playlist_from_db(std::stoi(playlist_id), &playlist);
+  int ret = media_playlist_get_playlist_from_db(std::stoi(playlist_id), &playlist);
   if(ret != MEDIA_CONTENT_ERROR_NONE && playlist == NULL) {
     PlatformResult err(ErrorCode::UNKNOWN_ERR, "Getting playlist is failed.");
     user_data->isSuccess = err;
@@ -1159,11 +1152,10 @@ void ContentManager::playlistRemovebatch(const std::shared_ptr<ReplyCallbackData
 void ContentManager::playlistSetOrder(const std::shared_ptr<ReplyCallbackData>& user_data) {
 
   LoggerD("Enter");
-  int ret = MEDIA_CONTENT_ERROR_NONE;
   media_playlist_h playlist = NULL;
 
   std::string playlist_id = user_data->args.get("playlistId").get<std::string>();
-  ret = media_playlist_get_playlist_from_db(std::stoi(playlist_id), &playlist);
+  int ret = media_playlist_get_playlist_from_db(std::stoi(playlist_id), &playlist);
   if(ret != MEDIA_CONTENT_ERROR_NONE && playlist == NULL) {
     PlatformResult err(ErrorCode::UNKNOWN_ERR, "Getting playlist is failed.");
     user_data->isSuccess = err;
@@ -1207,10 +1199,9 @@ void ContentManager::playlistSetOrder(const std::shared_ptr<ReplyCallbackData>&
 
 void ContentManager::playlistMove(const std::shared_ptr<ReplyCallbackData>& user_data) {
   LoggerD("Enter");
-  int ret = MEDIA_CONTENT_ERROR_NONE;
   media_playlist_h playlist = NULL;
   std::string playlist_id = user_data->args.get("playlistId").get<std::string>();
-  ret = media_playlist_get_playlist_from_db(std::stoi(playlist_id), &playlist);
+  int ret = media_playlist_get_playlist_from_db(std::stoi(playlist_id), &playlist);
   if(ret != MEDIA_CONTENT_ERROR_NONE && playlist == NULL) {
     LoggerE("Failed: Getting playlist is failed");
     PlatformResult err(ErrorCode::UNKNOWN_ERR, "Getting playlist is failed.");
@@ -1445,8 +1436,6 @@ int ContentManager::setThumbnailUri(int id, const std::string& thb_uri)
       LoggerE("thumbnail URI is not valid: [%s]", thb_uri.c_str());
       return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
     }
-
-    std::string absoulte_path = thb_uri.substr(uri_prefix.length());
     /// TODO check if uri points an existing file
   }