Break out Package read/write

1 files changed, 3 insertions, 5 deletions

diff --git a/src/monitor-cmd.cc b/src/monitor-cmd.cc
index 449656e..ba02703 100644
--- a/src/monitor-cmd.cc
+++ b/src/monitor-cmd.cc
@@ -53,8 +53,7 @@ public:
     std::cerr << "# Error: " << error << std::endl;
   }
 
-  void package(
-      Monitor* UNUSED(monitor), Monitor::Package const& package) override {
+  void package(Monitor* UNUSED(monitor), Package const& package) override {
     packages_.insert(std::make_pair(package.id, package));
   }
 
@@ -93,8 +92,7 @@ public:
   }
 
 private:
-  void print_package(
-      Monitor::Package& pkg, bool last, char const* data, size_t size) {
+  void print_package(Package& pkg, bool last, char const* data, size_t size) {
     if (size == 0 && !last) return;
     {
       ios_save save(out_);
@@ -170,7 +168,7 @@ private:
   bool interleave_;
   Looper* looper_;
   bool attached_;
-  std::unordered_map<uint32_t, Monitor::Package> packages_;
+  std::unordered_map<uint32_t, Package> packages_;
   // Used when interleaving
   std::unordered_map<uint32_t, uint64_t> offset_;
   // Used when not interleaving