Removing unused functions from step_create_symbolic_link, step_parse, task

Change-Id: Ib7ff457956ce32316ef6bbf8f835f94a3c41b995

diff --git a/src/tpk/step/step_create_symbolic_link.cc b/src/tpk/step/step_create_symbolic_link.cc
index 921ece1..e9c31be 100644 (file)
--- a/src/tpk/step/step_create_symbolic_link.cc
+++ b/src/tpk/step/step_create_symbolic_link.cc
@@ -20,8 +20,6 @@ namespace fs = boost::filesystem;
 using common_installer::ContextInstaller;
 typedef common_installer::Step::Status Status;
 
-SCOPE_LOG_TAG(SymbolicLink)
-
 namespace {
 
 template <typename T>

diff --git a/src/tpk/step/step_create_symbolic_link.h b/src/tpk/step/step_create_symbolic_link.h
index 1d50a5e..a763f68 100644 (file)
--- a/src/tpk/step/step_create_symbolic_link.h
+++ b/src/tpk/step/step_create_symbolic_link.h
@@ -3,6 +3,7 @@
 #define TPK_STEP_STEP_CREATE_SYMBOLIC_LINK_H_
 
 #include "common/app_installer.h"
+#include "common/utils/logging.h"
 
 namespace tpk {
 namespace filesystem {
@@ -14,6 +15,8 @@ class StepCreateSymbolicLink : public common_installer::Step {
   Status clean() override { return Status::OK; }
   Status undo() override;
   Status precheck() override;
+
+  SCOPE_LOG_TAG(SymbolicLink)
 };
 
 }  // namespace filesystem

diff --git a/src/tpk/step/step_parse.cc b/src/tpk/step/step_parse.cc
index a083999..ff3bed8 100644 (file)
--- a/src/tpk/step/step_parse.cc
+++ b/src/tpk/step/step_parse.cc
@@ -65,8 +65,6 @@ namespace {
 
 }  // namespace
 
-SCOPE_LOG_TAG(StepParse)
-
 /* short namespace/class name */
 typedef common_installer::Step::Status Status;
 using boost::filesystem::path;

diff --git a/src/tpk/step/step_parse.h b/src/tpk/step/step_parse.h
index 62ccfcb..bc79d3a 100644 (file)
--- a/src/tpk/step/step_parse.h
+++ b/src/tpk/step/step_parse.h
@@ -3,6 +3,7 @@
 #define TPK_STEP_STEP_PARSE_H_
 
 #include "common/step/step.h"
+#include "common/utils/logging.h"
 #include "tpk/xml_parser/xml_parser.h"
 
 namespace tpk {
@@ -23,6 +24,8 @@ class StepParse : public common_installer::Step {
       xml_parser::XmlTree* tree, xml_parser::XmlElement* manifest);
   bool SetPkgInfoChildren(manifest_x *m,
       xml_parser::XmlTree *tree, xml_parser::XmlElement* manifest);
+
+  SCOPE_LOG_TAG(StepParse)
 };
 
 }  // namespace parse

diff --git a/src/tpk/task.cc b/src/tpk/task.cc
index 1e37833..5ca95ad 100644 (file)
--- a/src/tpk/task.cc
+++ b/src/tpk/task.cc
@@ -43,8 +43,6 @@ const char kPkgType[] = "tpk";
 
 namespace tpk {
 
-SCOPE_LOG_TAG(TpkTask)
-
 /* Constructor
  */
 Task::Task() {

diff --git a/src/tpk/task.h b/src/tpk/task.h
index bab2ed2..d637aba 100644 (file)
--- a/src/tpk/task.h
+++ b/src/tpk/task.h
@@ -5,6 +5,7 @@
 #ifdef HOSTTEST
 #include "test/mock_pkgmgr_installer.h"
 #endif
+#include "common/utils/logging.h"
 
 namespace tpk {
 
@@ -20,6 +21,8 @@ class Task {
   int Update();
   int Uninstall();
   int Reinstall();
+
+  SCOPE_LOG_TAG(TpkTask)
 };  //  class Task
 
 }  //  namespace tpk