[Cpplint] Stylecheck error - other

Fixes the rest of errors (about 10)

Change-Id: Icfd9147e6615154a688cd7e773b2d679865cf073

diff --git a/src/common/step/step_copy.cc b/src/common/step/step_copy.cc
index 9d0975e..60b864e 100644 (file)
--- a/src/common/step/step_copy.cc
+++ b/src/common/step/step_copy.cc
@@ -5,6 +5,7 @@
 #include <cassert>
 #include <cstring>
 #include <iostream>
+#include <string>
 
 #include "common/utils.h"
 

diff --git a/src/common/step/step_signature.h b/src/common/step/step_signature.h
index 5ad725b..175e597 100644 (file)
--- a/src/common/step/step_signature.h
+++ b/src/common/step/step_signature.h
@@ -16,8 +16,8 @@ class StepSignature : public Step {
   using Step::Step;
 
   int process(ContextInstaller* context) override;
-  int undo(ContextInstaller*) override { return 0; }
-  int clean(ContextInstaller*) override { return 0; }
+  int undo(ContextInstaller* /*context*/) override { return 0; }
+  int clean(ContextInstaller* /*context*/) override { return 0; }
 };
 
 }  // namespace signature

diff --git a/src/common/step/step_unzip.h b/src/common/step/step_unzip.h
index 950f1ed..7926b95 100644 (file)
--- a/src/common/step/step_unzip.h
+++ b/src/common/step/step_unzip.h
@@ -21,7 +21,7 @@ class StepUnzip : public Step {
   int clean(ContextInstaller* /*context*/) override { return 0; }
   int undo(ContextInstaller* context) override;
 
-  boost::filesystem::path GenerateTmpDir(const char*);
+  boost::filesystem::path GenerateTmpDir(const char* app_path);
   int ExtractToTmpDir(const char* source_dir,
                       const boost::filesystem::path& tmp_dir);
 };

diff --git a/src/common/utils.cc b/src/common/utils.cc
index 1f70185..804a090 100644 (file)
--- a/src/common/utils.cc
+++ b/src/common/utils.cc
@@ -4,6 +4,7 @@
 
 #include <boost/filesystem/path.hpp>
 #include <iostream>
+#include <string>
 
 #define ERR(msg) std::cout << "[ERROR] " << msg << std::endl;
 

diff --git a/src/signature/logging.h b/src/signature/logging.h
index 2d3beb6..199a14f 100644 (file)
--- a/src/signature/logging.h
+++ b/src/signature/logging.h
@@ -22,7 +22,7 @@ class LogCatcher {
   }
 };
 
-}
+}  // namespace detail
 
 #define LOG(LEVEL)                                                             \
     ::detail::LogCatcher() & std::ostringstream() << "[" << #LEVEL << "] "     \

diff --git a/src/signature/signature_validator.cc b/src/signature/signature_validator.cc
index 05d6427..2b30d28 100644 (file)
--- a/src/signature/signature_validator.cc
+++ b/src/signature/signature_validator.cc
@@ -24,7 +24,6 @@
 namespace bf = boost::filesystem;
 
 namespace {
-using namespace common_installer;
 
 const int kXMLLogSize = 1024;
 
@@ -155,7 +154,7 @@ bool XMLSchemaValidate(
 }
 
 bool CheckObjectID(
-    const signature::SignatureData& signature_data) {
+    const common_installer::signature::SignatureData& signature_data) {
   std::string object_id = signature_data.object_id();
   std::set<std::string> reference_set = signature_data.reference_set();
 
@@ -169,7 +168,7 @@ bool CheckObjectID(
 }
 
 bool CheckRoleURI(
-    const signature::SignatureData& signature_data) {
+    const common_installer::signature::SignatureData& signature_data) {
   std::string role_uri = signature_data.role_uri();
 
   if (role_uri.empty()) {
@@ -193,7 +192,8 @@ bool CheckRoleURI(
   return true;
 }
 
-bool CheckProfileURI(const signature::SignatureData& signature_data) {
+bool CheckProfileURI(
+    const common_installer::signature::SignatureData& signature_data) {
   if (kTokenProfileURI != signature_data.profile_uri()) {
     LOG(ERROR) << "Profile tag contains unsupported value in URI attribute.";
     return false;
@@ -225,7 +225,8 @@ boost::filesystem::path RelativePath(const boost::filesystem::path& path,
   return path_str.substr(index);
 }
 
-bool CheckReference(const signature::SignatureData& signature_data) {
+bool CheckReference(
+    const common_installer::signature::SignatureData& signature_data) {
   const bf::path& widget_path = signature_data.GetExtractedWidgetPath();
   const std::set<std::string>& reference_set = signature_data.reference_set();
 

diff --git a/src/signature/signature_xmlsec_adaptor.cc b/src/signature/signature_xmlsec_adaptor.cc
index 20f44ef..e905fad 100644 (file)
--- a/src/signature/signature_xmlsec_adaptor.cc
+++ b/src/signature/signature_xmlsec_adaptor.cc
@@ -40,7 +40,6 @@ namespace bai = boost::archive::iterators;
 namespace bf = boost::filesystem;
 
 namespace {
-using namespace common_installer;
 
 const bf::path cert_prefix_path = "/usr/share/ca-certificates/tizen/";
 
@@ -130,11 +129,13 @@ std::string ConvertBase64ToDerCert(const std::string& cert_in) {
 
 class XmlSecContext {
  public:
-  static void GetExtractedPath(const signature::SignatureData& data);
+  static void GetExtractedPath(
+      const common_installer::signature::SignatureData& data);
   static xmlSecKeysMngrPtr LoadTrustedCerts(
-      const signature::SignatureData& signature_data);
+      const common_installer::signature::SignatureData& signature_data);
   static bool VerifyFile(
-      xmlSecKeysMngrPtr mngr, const signature::SignatureData& data);
+      xmlSecKeysMngrPtr mngr,
+      const common_installer::signature::SignatureData& data);
 
  private:
   static int FileMatchCallback(const char* file_name);
@@ -151,7 +152,7 @@ bf::path XmlSecContext::prefix_path_;
 std::pair<void*, bool> XmlSecContext::file_wrapper_;
 
 void XmlSecContext::GetExtractedPath(
-    const signature::SignatureData& data) {
+    const common_installer::signature::SignatureData& data) {
   prefix_path_ = data.GetExtractedWidgetPath();
 }
 
@@ -194,7 +195,7 @@ int XmlSecContext::FileCloseCallback(void* context) {
 }
 
 xmlSecKeysMngrPtr XmlSecContext::LoadTrustedCerts(
-    const signature::SignatureData& signature_data) {
+    const common_installer::signature::SignatureData& signature_data) {
   xmlSecKeysMngrPtr mngr = xmlSecKeysMngrCreate();
   if (!mngr) {
     LOG(ERROR) << "Error: failed to create keys manager.";
@@ -269,7 +270,7 @@ xmlSecKeysMngrPtr XmlSecContext::LoadTrustedCerts(
 }
 
 bool XmlSecContext::VerifyFile(xmlSecKeysMngrPtr mngr,
-                              const signature::SignatureData& data) {
+    const common_installer::signature::SignatureData& data) {
   LOG(INFO) << "Verify " << data.signature_file_name();
   xmlSecIOCleanupCallbacks();
   XmlSecContext::GetExtractedPath(data);

diff --git a/src/wgt/step_parse.cc b/src/wgt/step_parse.cc
index 0cf1c93..d8b7c2e 100644 (file)
--- a/src/wgt/step_parse.cc
+++ b/src/wgt/step_parse.cc
@@ -1,3 +1,5 @@
+/* 2014, Copyright © Intel Coporation, license APACHE-2.0, see LICENSE file */
+
 #include <iostream>
 #include <cstdio>
 #include <cstdlib>
@@ -7,8 +9,7 @@
 
 namespace {
 
-API manifest_x *pkgmgr_parser_process_manifest_xml(const char *manifest)
-{
+API manifest_x *pkgmgr_parser_process_manifest_xml(const char *manifest) {
   _LOGD("parsing start pkgmgr_parser_process_manifest_xml\n");
   xmlTextReaderPtr reader;
   manifest_x *mfx = NULL;
@@ -22,8 +23,9 @@ API manifest_x *pkgmgr_parser_process_manifest_xml(const char *manifest)
         _LOGD("Parsing Failed\n");
         pkgmgr_parser_free_manifest_xml(mfx);
         mfx = NULL;
-      } else
+      } else {
         _LOGD("Parsing Success\n");
+      }
     } else {
       _LOGD("Memory allocation error\n");
     }
@@ -40,8 +42,7 @@ namespace wgt {
 namespace parse {
 
 Class ConfigFileParser {
-ConfigFileParser(char * file)
-{
+ConfigFileParser(char * file) {
 }
 }
 
@@ -53,5 +54,5 @@ class Step {
 // undo
 };
 
-}  // namespace wgt
 }  // namespace parse
+}  // namespace wgt