diff options
author | Chris Wilson <chris+github@qwirx.com> | 2010-06-06 14:18:51 +0000 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2010-06-06 14:18:51 +0000 |
commit | a781743ecbb955be9e17d47a5714b19f1e17205d (patch) | |
tree | 44c308b0bf4fdff75c9ad45e64b4dffc4f166a06 /lib/server | |
parent | d6aa5749dffa351de158af5bdb79b6897328fa98 (diff) |
Replace BOX_FILE_BBACKUPD_DEFAULT_CONFIG with
BOX_GET_DEFAULT_BBACKUPD_CONFIG_FILE.
Diffstat (limited to 'lib/server')
-rw-r--r-- | lib/server/Daemon.cpp | 5 | ||||
-rw-r--r-- | lib/server/Daemon.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/server/Daemon.cpp b/lib/server/Daemon.cpp index c4026395..abf4d7cb 100644 --- a/lib/server/Daemon.cpp +++ b/lib/server/Daemon.cpp @@ -291,10 +291,11 @@ int Daemon::ProcessOption(signed int option) // Created: 2003/07/29 // // -------------------------------------------------------------------------- -int Daemon::Main(const char *DefaultConfigFile, int argc, const char *argv[]) +int Daemon::Main(const std::string& rDefaultConfigFile, int argc, + const char *argv[]) { // Find filename of config file - mConfigFileName = DefaultConfigFile; + mConfigFileName = rDefaultConfigFile; mAppName = argv[0]; #ifdef BOX_RELEASE_BUILD diff --git a/lib/server/Daemon.h b/lib/server/Daemon.h index a3212a00..82532366 100644 --- a/lib/server/Daemon.h +++ b/lib/server/Daemon.h @@ -40,7 +40,7 @@ private: Daemon(const Daemon &rToCopy); public: - virtual int Main(const char *DefaultConfigFile, int argc, + virtual int Main(const std::string& rDefaultConfigFile, int argc, const char *argv[]); /* override this Main() if you want custom option processing: */ |