From: Anna Niznik Date: Tue, 21 Jul 2015 11:43:10 +0000 (+0200) Subject: Removing warnings from module: archive. X-Git-Tag: submit/tizen/20151026.073646^2^2~222 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=14b56e566908f42e6b3c05f27062f76a67e77d03;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git Removing warnings from module: archive. Using cppcheck (with --enable=all flag). [Verification] TCT result: Before: 100.00% After: 100.00% Change-Id: Ia660f9794277ee50300c6000a32dc6ac6a1ae572 Signed-off-by: Anna Niznik --- diff --git a/src/archive/archive_callback_data.cc b/src/archive/archive_callback_data.cc index d57b7b26..79e9355f 100755 --- a/src/archive/archive_callback_data.cc +++ b/src/archive/archive_callback_data.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - + #include "archive_callback_data.h" #include "common/logger.h" diff --git a/src/archive/filesystem_file.cc b/src/archive/filesystem_file.cc index 04e963e9..cbd8de7e 100755 --- a/src/archive/filesystem_file.cc +++ b/src/archive/filesystem_file.cc @@ -22,7 +22,7 @@ namespace extension { namespace filesystem { File::File(NodePtr node, const File::PermissionList &parentPermissions, - const std::string original_location) : + const std::string& original_location) : m_node(node), m_parentPerms(parentPermissions) { diff --git a/src/archive/filesystem_file.h b/src/archive/filesystem_file.h index 40c86f5d..26401f29 100755 --- a/src/archive/filesystem_file.h +++ b/src/archive/filesystem_file.h @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - + #ifndef _TIZEN_FILESYSTEM_FILE_H_ #define _TIZEN_FILESYSTEM_FILE_H_ @@ -38,7 +38,7 @@ public: File(NodePtr node, const PermissionList &parentPermissions, - const std::string original_location = std::string()); + const std::string& original_location = std::string()); virtual ~File(); NodePtr getNode() const; diff --git a/src/archive/filesystem_node.cc b/src/archive/filesystem_node.cc index 7c266d12..4e2744b5 100755 --- a/src/archive/filesystem_node.cc +++ b/src/archive/filesystem_node.cc @@ -147,7 +147,7 @@ PlatformResult Node::resolve(const PathPtr& path, NodePtr* node) } } - if (!S_ISDIR(info.st_mode) & !S_ISREG(info.st_mode) && !S_ISLNK(info.st_mode)) { + if ((!S_ISDIR(info.st_mode)) & (!S_ISREG(info.st_mode)) && !S_ISLNK(info.st_mode)) { LoggerE("throw IOException for file:[%s]", path->getFullPath().c_str()); return PlatformResult(ErrorCode::IO_ERR, "Platform node is of unsupported type."); } @@ -599,11 +599,10 @@ PlatformResult Node::removeAsDirectory(const PathPtr& path, bool recursive) LoggerE("throw IOException"); return PlatformResult(ErrorCode::IO_ERR, "Node does not exist or access denied."); } - int err = 0; struct dirent entry = {0}; struct dirent* result = nullptr; PlatformResult platform_result(ErrorCode::NO_ERROR); - while ((0 == (err = readdir_r(dir, &entry, &result))) && result) { + while ((0 == (readdir_r(dir, &entry, &result))) && result) { if (!strcmp(entry.d_name, ".") || !strncmp(entry.d_name, "..", 2)) { continue; } diff --git a/src/archive/un_zip.cc b/src/archive/un_zip.cc index 51724c22..5ce5ddd0 100755 --- a/src/archive/un_zip.cc +++ b/src/archive/un_zip.cc @@ -319,7 +319,6 @@ PlatformResult UnZip::extractItFunction(const std::string& file_name, unz_file_i LoggerE("Error: %s", result.message().c_str()); return result; } - return PlatformResult(ErrorCode::NO_ERROR); } @@ -438,7 +437,7 @@ PlatformResult generateArchiveStatistics(const std::string& file_name, unz_file_ PlatformResult UnZip::updateCallbackWithArchiveStatistics(ExtractAllProgressCallback* callback, unz_global_info& out_global_info, - const std::string optional_filter) + const std::string& optional_filter) { LoggerD("Enter"); int err = unzGetGlobalInfo(m_unzip, &out_global_info); diff --git a/src/archive/un_zip.h b/src/archive/un_zip.h index 30dc9e3a..187d9c5b 100755 --- a/src/archive/un_zip.h +++ b/src/archive/un_zip.h @@ -83,7 +83,7 @@ private: PlatformResult updateCallbackWithArchiveStatistics(ExtractAllProgressCallback* callback, unz_global_info& out_global_info, - const std::string optional_filter = std::string()); + const std::string& optional_filter = std::string()); std::string m_zipfile_name; unzFile m_unzip; diff --git a/src/archive/un_zip_extract_request.cc b/src/archive/un_zip_extract_request.cc index aeebcd8e..df320dd9 100755 --- a/src/archive/un_zip_extract_request.cc +++ b/src/archive/un_zip_extract_request.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - + #include "un_zip_extract_request.h" #include @@ -421,7 +421,6 @@ PlatformResult UnZipExtractRequest::handleFileEntry() } m_delete_output_file = true; - int read_size = 0; bool marked_as_finished = false; LoggerD("Started extracting: [%s] uncompressed size: %d - %s", m_filename_inzip, @@ -448,7 +447,7 @@ PlatformResult UnZipExtractRequest::handleFileEntry() return PlatformResult(ErrorCode::OPERATION_CANCELED_ERR); } - read_size = unzReadCurrentFile(m_owner.m_unzip, m_buffer, buffer_size); + int read_size = unzReadCurrentFile(m_owner.m_unzip, m_buffer, buffer_size); if (read_size < 0) { LoggerE("unzReadCurrentFile failed with error code:%d for file:%s", read_size, m_filename_inzip);