From 4eefd5c1ab7feb7b42d18fceae60ab2cf1d2578d Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Fri, 18 Feb 2022 07:53:48 +0100 Subject: [PATCH] #21 finalize -> finalise --- BaseCommon/Daemon.cpp | 2 +- BaseCommon/Daemon.h | 6 +++--- DStarGateway/DStarGatewayApp.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/BaseCommon/Daemon.cpp b/BaseCommon/Daemon.cpp index d0afc21..6fc09b0 100644 --- a/BaseCommon/Daemon.cpp +++ b/BaseCommon/Daemon.cpp @@ -175,7 +175,7 @@ DAEMONIZE_RESULT CDaemon::daemonize(const std::string& pidFile, const std::strin return DR_CHILD; } -void CDaemon::finalize() +void CDaemon::finalise() { releaseLock(m_pid_fd, m_pidFileName); diff --git a/BaseCommon/Daemon.h b/BaseCommon/Daemon.h index 0981896..3fa8809 100644 --- a/BaseCommon/Daemon.h +++ b/BaseCommon/Daemon.h @@ -30,11 +30,11 @@ class CDaemon { public: static DAEMONIZE_RESULT daemonize(const std::string& pidFile, const std::string& user); - static void finalize(); + static void finalise(); private: - static int tryGetLock(const std::string& file ); - static void releaseLock(int fd, const std::string& file ); + static int tryGetLock(const std::string& file); + static void releaseLock(int fd, const std::string& file); static int m_pid_fd; static std::string m_pidFileName; diff --git a/DStarGateway/DStarGatewayApp.cpp b/DStarGateway/DStarGatewayApp.cpp index 9483208..8604a00 100644 --- a/DStarGateway/DStarGatewayApp.cpp +++ b/DStarGateway/DStarGatewayApp.cpp @@ -134,7 +134,7 @@ int main(int argc, char *argv[]) gateway.run(); if(daemon.daemon) { - CDaemon::finalize(); + CDaemon::finalise(); } return 0;