refactor: cleanup daemonApp args
This commit is contained in:
@ -18,7 +18,7 @@ int ArchDaemonNone::daemonize(const QString &name, DaemonFunc const &func)
|
||||
// do any daemonizing.
|
||||
auto t = name.toStdString();
|
||||
const char *n = t.c_str();
|
||||
return func(1, &n);
|
||||
return func();
|
||||
}
|
||||
|
||||
QString ArchDaemonNone::commandLine() const
|
||||
|
||||
@ -20,7 +20,7 @@ implement this interface.
|
||||
class IArchDaemon
|
||||
{
|
||||
public:
|
||||
using DaemonFunc = std::function<int(int, const char **)>;
|
||||
using DaemonFunc = std::function<int()>;
|
||||
|
||||
virtual ~IArchDaemon() = default;
|
||||
//! @name manipulators
|
||||
|
||||
@ -53,7 +53,7 @@ int ArchDaemonUnix::daemonize(const QString &name, DaemonFunc const &func)
|
||||
if (alreadyDaemonized()) {
|
||||
auto t = name.toStdString();
|
||||
const char *n = t.c_str();
|
||||
return func(1, &n);
|
||||
return func();
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -111,5 +111,5 @@ int ArchDaemonUnix::daemonize(const QString &name, DaemonFunc const &func)
|
||||
|
||||
auto t = name.toStdString();
|
||||
const char *n = t.c_str();
|
||||
return func(1, &n);
|
||||
return func();
|
||||
}
|
||||
|
||||
@ -297,7 +297,7 @@ void ArchDaemonWindows::serviceMain(DWORD argc, LPTSTR *argvIn)
|
||||
|
||||
try {
|
||||
// invoke daemon function
|
||||
m_daemonResult = m_daemonFunc(static_cast<int>(argc), reinterpret_cast<const char **>(argv));
|
||||
m_daemonResult = m_daemonFunc();
|
||||
} catch (ArchDaemonRunException &e) {
|
||||
setStatusError(e.m_result);
|
||||
m_daemonResult = -1;
|
||||
|
||||
@ -138,7 +138,7 @@ void DaemonApp::run(QThread &daemonThread)
|
||||
mainLoop();
|
||||
} else {
|
||||
LOG_DEBUG("running daemon in background (daemonizing)");
|
||||
ARCH->daemonize(kAppName, [this](int, const char **) { return daemonLoop(); });
|
||||
ARCH->daemonize(kAppName, [this] { return daemonLoop(); });
|
||||
}
|
||||
|
||||
daemonThread.quit();
|
||||
|
||||
@ -97,7 +97,7 @@ static int daemonNTStartupStatic()
|
||||
return AppUtilWindows::instance().daemonNTStartup();
|
||||
}
|
||||
|
||||
static int foregroundStartupStatic(int argc, char **argv)
|
||||
static int foregroundStartupStatic()
|
||||
{
|
||||
return AppUtil::instance().app().start();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user