Changeset 2694

Timestamp:

06/06/2010 15:18:51 (2 years ago)

Author:

chris

Message:

Replace BOX_FILE_BBACKUPD_DEFAULT_CONFIG with
BOX_GET_DEFAULT_BBACKUPD_CONFIG_FILE.

Location:

box/trunk

Files:

• bin/bbackupctl/bbackupctl.cpp (modified) (1 diff)
• bin/bbackupd/bbackupd.cpp (modified) (1 diff)
• lib/common/BoxPortsAndFiles.h.in (modified) (1 diff)
• lib/server/Daemon.cpp (modified) (1 diff)
• lib/server/Daemon.h (modified) (1 diff)

box/trunk/bin/bbackupctl/bbackupctl.cpp

@@ -68 +68 @@
 
         // Filename for configuration file?
-        std::string configFilename;
-
-        #ifdef WIN32
-                configFilename = BOX_GET_DEFAULT_BBACKUPD_CONFIG_FILE;
-        #else
-                configFilename = BOX_FILE_BBACKUPD_DEFAULT_CONFIG;
-        #endif
+        std::string configFilename = BOX_GET_DEFAULT_BBACKUPD_CONFIG_FILE;
         
         // Quiet?

box/trunk/bin/bbackupd/bbackupd.cpp

@@ -47 +47 @@
 
         BackupDaemon daemon;
-        ExitCode = daemon.Main(BOX_FILE_BBACKUPD_DEFAULT_CONFIG, argc, argv);
+        ExitCode = daemon.Main(BOX_GET_DEFAULT_BBACKUPD_CONFIG_FILE,
+                argc, argv);
 
 #endif // WIN32

box/trunk/lib/common/BoxPortsAndFiles.h.in

@@ -33 +33 @@
                 GetDefaultConfigFilePath("bbstored.conf").c_str()
 #else
-#define BOX_FILE_BBACKUPD_DEFAULT_CONFIG "@sysconfdir_expanded@/boxbackup/bbackupd.conf"
-#define BOX_FILE_RAIDFILE_DEFAULT_CONFIG "@sysconfdir_expanded@/boxbackup/raidfile.conf"
-#define BOX_FILE_BBSTORED_DEFAULT_CONFIG "@sysconfdir_expanded@/boxbackup/bbstored.conf"
-#define BOX_FILE_BBACKUPD_OLD_CONFIG "@sysconfdir_expanded@/box/bbackupd.conf"
-#define BOX_FILE_RAIDFILE_OLD_CONFIG "@sysconfdir_expanded@/box/raidfile.conf"
-#define BOX_FILE_BBSTORED_OLD_CONFIG "@sysconfdir_expanded@/box/bbstored.conf"
+        #define BOX_FILE_BBACKUPD_OLD_CONFIG "@sysconfdir_expanded@/box/bbackupd.conf"
+        #define BOX_FILE_RAIDFILE_OLD_CONFIG "@sysconfdir_expanded@/box/raidfile.conf"
+        #define BOX_FILE_BBSTORED_OLD_CONFIG "@sysconfdir_expanded@/box/bbstored.conf"
+        #define BOX_GET_DEFAULT_BBACKUPD_CONFIG_FILE \
+                std::string("@sysconfdir_expanded@/boxbackup/bbackupd.conf")
+        #define BOX_GET_DEFAULT_RAIDFILE_CONFIG_FILE \
+                std::string("@sysconfdir_expanded@/boxbackup/raidfile.conf")
+        #define BOX_GET_DEFAULT_BBSTORED_CONFIG_FILE \
+                std::string("@sysconfdir_expanded@/boxbackup/bbstored.conf")
 #endif
 

box/trunk/lib/server/Daemon.cpp

@@ -292 +292 @@
 //
 // --------------------------------------------------------------------------
-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];
 

box/trunk/lib/server/Daemon.h

@@ -41 +41 @@
 public:
 
-        virtual int Main(const char *DefaultConfigFile, int argc,
+        virtual int Main(const std::string& rDefaultConfigFile, int argc,
                 const char *argv[]);