chore: Remove dead code; unused outputter param on runInner functions

src/lib/deskflow/App.cpp

@@ -264,7 +264,7 @@ int MinimalApp::standardStartup(int argc, char **argv)
   return 0;
 }
 
-int MinimalApp::runInner(int argc, char **argv, ILogOutputter *outputter, StartupFunc startup)
+int MinimalApp::runInner(int argc, char **argv, StartupFunc startup)
 {
   return 0;
 }

src/lib/deskflow/App.h

@@ -21,11 +21,12 @@
 
 #include <stdexcept>
 
-class ILogOutputter;
-class FileLogOutputter;
 namespace deskflow {
 class Screen;
 }
+
+class ILogOutputter;
+class FileLogOutputter;
 class IEventQueue;
 class SocketMultiplexer;
 
@@ -136,7 +137,7 @@ public:
 
   // IApp overrides
   virtual int standardStartup(int argc, char **argv) override;
-  virtual int runInner(int argc, char **argv, ILogOutputter *outputter, StartupFunc startup) override;
+  virtual int runInner(int argc, char **argv, StartupFunc startup) override;
   virtual void startNode() override;
   virtual int mainLoop() override;
   virtual int foregroundStartup(int argc, char **argv) override;

src/lib/deskflow/ClientApp.cpp

@@ -510,17 +510,12 @@ int ClientApp::standardStartup(int argc, char **argv)
   }
 }
 
-int ClientApp::runInner(int argc, char **argv, ILogOutputter *outputter, StartupFunc startup)
+int ClientApp::runInner(int argc, char **argv, StartupFunc startup)
 {
   // general initialization
   m_serverAddress = new NetworkAddress;
   args().m_pname = ARCH->getBasename(argv[0]);
 
-  // install caller's output filter
-  if (outputter != NULL) {
-    CLOG->insert(outputter);
-  }
-
   int result;
   try {
     // run

src/lib/deskflow/ClientApp.h

@@ -11,17 +11,15 @@
 
 namespace deskflow {
 class Screen;
-}
+class ClientArgs;
+} // namespace deskflow
+
 class Event;
 class Client;
 class NetworkAddress;
 class Thread;
 class ISocketFactory;
 
-namespace deskflow {
-class ClientArgs;
-}
-
 class ClientApp : public App
 {
 public:
@@ -45,7 +43,7 @@ public:
   }
   int foregroundStartup(int argc, char **argv) override;
   int standardStartup(int argc, char **argv) override;
-  int runInner(int argc, char **argv, ILogOutputter *outputter, StartupFunc startup) override;
+  int runInner(int argc, char **argv, StartupFunc startup) override;
   deskflow::Screen *createScreen() override;
   int mainLoop() override;
   void startNode() override;

src/lib/deskflow/IApp.h

@@ -13,12 +13,9 @@ typedef int (*StartupFunc)(int, char **);
 
 namespace deskflow {
 class ArgsBase;
-}
-
-class ILogOutputter;
-namespace deskflow {
 class Screen;
-}
+} // namespace deskflow
+
 class IEventQueue;
 
 class IApp : public IInterface
@@ -27,7 +24,7 @@ public:
   virtual void setByeFunc(void (*bye)(int)) = 0;
   virtual deskflow::ArgsBase &argsBase() const = 0;
   virtual int standardStartup(int argc, char **argv) = 0;
-  virtual int runInner(int argc, char **argv, ILogOutputter *outputter, StartupFunc startup) = 0;
+  virtual int runInner(int argc, char **argv, StartupFunc startup) = 0;
   virtual void startNode() = 0;
   virtual void bye(int error) = 0;
   virtual int mainLoop() = 0;

src/lib/deskflow/ServerApp.cpp

@@ -776,18 +776,13 @@ void ServerApp::resetServer(const Event &, void *)
   startServer();
 }
 
-int ServerApp::runInner(int argc, char **argv, ILogOutputter *outputter, StartupFunc startup)
+int ServerApp::runInner(int argc, char **argv, StartupFunc startup)
 {
   // general initialization
   m_deskflowAddress = new NetworkAddress;
   args().m_config = std::make_shared<Config>(m_events);
   args().m_pname = ARCH->getBasename(argv[0]);
 
-  // install caller's output filter
-  if (outputter != NULL) {
-    CLOG->insert(outputter);
-  }
-
   // run
   int result = startup(argc, argv);
 

src/lib/deskflow/ServerApp.h

@@ -60,7 +60,7 @@ public:
   bool loadConfig(const std::string &pathname) override;
   deskflow::Screen *createScreen() override;
   int mainLoop() override;
-  int runInner(int argc, char **argv, ILogOutputter *outputter, StartupFunc startup) override;
+  int runInner(int argc, char **argv, StartupFunc startup) override;
   int standardStartup(int argc, char **argv) override;
   int foregroundStartup(int argc, char **argv) override;
   void startNode() override;

src/lib/deskflow/unix/AppUtilUnix.cpp

@@ -42,7 +42,7 @@ int standardStartupStatic(int argc, char **argv)
 
 int AppUtilUnix::run(int argc, char **argv)
 {
-  return app().runInner(argc, argv, NULL, &standardStartupStatic);
+  return app().runInner(argc, argv, &standardStartupStatic);
 }
 
 void AppUtilUnix::startNode()

src/lib/deskflow/win32/AppUtilWindows.cpp

@@ -119,7 +119,7 @@ int AppUtilWindows::run(int argc, char **argv)
     app().argsBase().m_daemon = false;
   }
 
-  return app().runInner(argc, argv, NULL, startup);
+  return app().runInner(argc, argv, startup);
 }
 
 AppUtilWindows &AppUtilWindows::instance()

src/test/mock/deskflow/MockApp.h

@@ -27,7 +27,7 @@ public:
   MOCK_METHOD(void, parseArgs, (int, const char *const *), (override));
   MOCK_METHOD(void, version, (), (override));
   MOCK_METHOD(int, standardStartup, (int, char **), (override));
-  MOCK_METHOD(int, runInner, (int, char **, ILogOutputter *, StartupFunc), (override));
+  MOCK_METHOD(int, runInner, (int, char **, StartupFunc), (override));
   MOCK_METHOD(void, startNode, (), (override));
   MOCK_METHOD(int, mainLoop, (), (override));
   MOCK_METHOD(int, foregroundStartup, (int, char **), (override));

src/test/unittests/deskflow/ServerAppTests.cpp

@@ -30,7 +30,7 @@ TEST(ServerAppTests, runInner_will_handle_configuration_lifetime)
   EXPECT_FALSE(app.args().m_config);
 
   const char *argv[]{"deskflow-server"};
-  app.runInner(1, const_cast<char **>(argv), nullptr, [](int, char **) { return 0; });
+  app.runInner(1, const_cast<char **>(argv), [](int, char **) { return 0; });
 
   EXPECT_TRUE(app.args().m_config);
 }