[1.0.25] Fix some cppcheck defects

Change-Id: I2907b9bff4f0ffae4a46f60a7b8b94b006ca79dc

diff --git a/packaging/capi-media-transporter.spec b/packaging/capi-media-transporter.spec
index 74a3d51b391242734f93bf4465a62c1dee41756c..d3ea6732743c3184ae1995e82578a567dc2a5e4a 100644 (file)
--- a/packaging/capi-media-transporter.spec
+++ b/packaging/capi-media-transporter.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-transporter
 Summary:    A Media Transporter library in Tizen Native API
-Version:    1.0.24
+Version:    1.0.25
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/MediaSourceBinMediaPacket.cpp b/src/MediaSourceBinMediaPacket.cpp
index 9ca106bfedc4d01e96f1cafb417d76f5de21c023..9ce0978c2d62071cc38573549e43ab4069ad0a95 100644 (file)
--- a/src/MediaSourceBinMediaPacket.cpp
+++ b/src/MediaSourceBinMediaPacket.cpp
@@ -262,7 +262,7 @@ GstBuffer* MediaSourceBinMediaPacket::_mediaPacketToGstBuffer(media_packet_h pac
                throw MediaTransporterException(MTPR_ERROR_INVALID_OPERATION, "failed to get buffer size");
        }
 
-       if (buf == nullptr || size <= 0) {
+       if (buf == nullptr || size == 0) {
                throw MediaTransporterException(MTPR_ERROR_INVALID_OPERATION, "packet buffer is null or size is zero");
        }
 

diff --git a/src/MediaTransporterGst.cpp b/src/MediaTransporterGst.cpp
index 6743317cec28e7e31e38540916e0bdbd2d6e2fea..2d66acc276e1ebbb92c1887b20f7c24f9ac86e41 100644 (file)
--- a/src/MediaTransporterGst.cpp
+++ b/src/MediaTransporterGst.cpp
@@ -463,7 +463,7 @@ static gboolean __elementFilter(GstPluginFeature* feature, gpointer data)
                return FALSE;
 
        auto it = std::find_if(elem_info->excludedElements.begin(), elem_info->excludedElements.end(),
-                                               [&factory_name](std::string& element) {
+                                               [&factory_name](const std::string& element) {
                                                        return element.find(factory_name) != std::string::npos;
                                                });
        if (it != elem_info->excludedElements.end()) {

diff --git a/src/MediaTransporterObserver.cpp b/src/MediaTransporterObserver.cpp
index f90956875bbcfced4a5655f7c35b2ef499285d18..0c907a18c1990d64146e48058fe936d6dde1feca 100644 (file)
--- a/src/MediaTransporterObserver.cpp
+++ b/src/MediaTransporterObserver.cpp
@@ -28,18 +28,13 @@ void ObservableBase::subscribe(IObserver * observer)
 
 void ObservableBase::notify()
 {
-       std::vector<IObserver *>::iterator iter = _observers.begin();
-       for (; iter != _observers.end(); iter++) {
-               IObserver *observer = *iter;
+       for (const auto& observer : _observers)
                observer->changed();
-       }
 }
 
 void ObservableBase::unsubscribe(IObserver *observer)
 {
-       std::vector<IObserver *>::iterator iter;
-       iter = std::find(_observers.begin(), _observers.end(), observer);
-       if (iter != _observers.end()) {
+       auto iter = std::find(_observers.begin(), _observers.end(), observer);
+       if (iter != _observers.end())
                _observers.erase(iter);
-       }
 }

diff --git a/src/MediaTransporterParseIni.cpp b/src/MediaTransporterParseIni.cpp
index 0b0d9e23d81d5f334a63695459b00b08b40ffd60..4c43e247dd06aa1946b5b9c4065d503080e1edd2 100644 (file)
--- a/src/MediaTransporterParseIni.cpp
+++ b/src/MediaTransporterParseIni.cpp
@@ -46,7 +46,10 @@ static void dumpItem(const char* prefix_str, std::vector<std::string>& item)
        LOG_INFO("- %-19s = %s", prefix_str, joined.c_str());
 }
 
-static std::vector<std::string> iniReadList(dictionary* dict, std::string category, std::string item, char delimeters)
+static std::vector<std::string> iniReadList(dictionary* dict,
+                                                                                       const std::string& category,
+                                                                                       const std::string& item,
+                                                                                       char delimeters)
 {
        std::vector<std::string> strings;
 
@@ -71,7 +74,10 @@ static std::vector<std::string> iniReadList(dictionary* dict, std::string catego
        return strings;
 }
 
-static std::string iniGetString(dictionary* dict, std::string category, std::string item, std::string default_value)
+static std::string iniGetString(dictionary* dict,
+                                                               const std::string& category,
+                                                               const std::string& item,
+                                                               std::string default_value)
 {
        if (!dict)
                return default_value;
@@ -82,7 +88,10 @@ static std::string iniGetString(dictionary* dict, std::string category, std::str
        return str;
 }
 
-static int iniGetInt(dictionary* dict, std::string category, std::string item, int default_value)
+static int iniGetInt(dictionary* dict,
+                                       const std::string& category,
+                                       const std::string& item,
+                                       int default_value)
 {
        if (!dict)
                return default_value;
@@ -92,7 +101,10 @@ static int iniGetInt(dictionary* dict, std::string category, std::string item, i
        return iniparser_getint(dict, key.c_str(), default_value);
 }
 
-static  bool iniGetBoolean(dictionary* dict, std::string category, std::string item, bool default_value)
+static  bool iniGetBoolean(dictionary* dict,
+                                               const std::string& category,
+                                               const std::string& item,
+                                               bool default_value)
 {
        if (!dict)
                return default_value;

diff --git a/unittest/ut_es_reader.hpp b/unittest/ut_es_reader.hpp
index 99de2ff30ae9602e33a8634406ca3d5e57efdca4..6ca2f445cd124e2543c7b26d00fbf1900bca193b 100644 (file)
--- a/unittest/ut_es_reader.hpp
+++ b/unittest/ut_es_reader.hpp
@@ -60,8 +60,8 @@ static const std::string tc_root_dir = "/home/owner/";
 
 class EsStreamReader {
 public:
-       explicit EsStreamReader(const std::string dirpath,
-                                                                                                       contentsType type) {
+       explicit EsStreamReader(const std::string& dirpath,
+                                                       contentsType type) {
                _dirPath = tc_root_dir + dirpath;
                _ESDataFile = _dirPath + "MTPR.es";
                _ESInfoFile = _dirPath + "MTPR.info";
@@ -82,7 +82,7 @@ public:
        bool makeMediaFormat() {
                media_format_create(&_mediaFormat);
                if (_type == MEDIA_TYPE_ENCODED_AUDIO ||
-                               _type == MEDIA_TYPE_RAW_AUDIO) {
+                       _type == MEDIA_TYPE_RAW_AUDIO) {
                        uint32_t mimeType;
                        uint32_t sampleRate;
                        uint32_t channels;