[REFACT] Cleanup: use wrapperId from the superclass

hasherezade · Jul 7, 2024 · e11ec8d · e11ec8d
1 parent 72f6762
commit e11ec8d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/commander/Commander.cpp b/commander/Commander.cpp
@@ -59,7 +59,6 @@ bool Commander::addCommand(const std::string& name, Command *cmd, bool overwrite
 void Commander::parseCommands()
 {
     const std::string PROMPT = "$ ";
-    Command *cmd = NULL;
 
     while (true) {
         if (this->context == NULL) throw CmdException("Uninitialized commander context!");

diff --git a/commander/Commander.h b/commander/Commander.h
@@ -39,6 +39,7 @@ friend class Commander;
 class Command
 {
 public:
+    Command() {}
     Command(const std::string& v_desc) : desc(v_desc) {}
     virtual ~Command() {}
 

diff --git a/commander/ExeCommander.h b/commander/ExeCommander.h
@@ -123,8 +123,9 @@ class WrapperCommand : public Command
         }
         wrapperAction(wrapper);
     }
+
 protected:
-    size_t wrapperId; //TODO: fetch it from params!
+    size_t wrapperId;
 };
 
 class AddEntryCommand : public WrapperCommand
@@ -174,7 +175,7 @@ class DumpWrapperEntriesCommand : public WrapperCommand
 {
 public:
     DumpWrapperEntriesCommand(const std::string& desc, size_t v_wrapperId = INVALID_WRAPPER)
-        : WrapperCommand(desc), wrapperId(v_wrapperId) {}
+        : WrapperCommand(desc, v_wrapperId) {}
 
     virtual void wrapperAction(ExeElementWrapper *wrapper)
     {
@@ -196,9 +197,6 @@ class DumpWrapperEntriesCommand : public WrapperCommand
         cmd_util::dumpEntryInfo(lib);
         cmd_util::dumpNodeInfo(lib);
     }
-
-protected:
-    size_t wrapperId; //TODO: fetch it from params!
 };
 
 

diff --git a/commander/PECommander.h b/commander/PECommander.h
@@ -101,8 +101,6 @@ class PrintStringsCommand : public Command
 
        cmd_util::printStrings(pe, limit);
     }
-protected:
-    int wrapperId; //TODO: fetch it from params!
 };
 
 class PrintWrapperTypesCommand : public Command