[Box Backup-commit] COMMIT r1775 - box/chris/merge/lib/raidfile

[boxbackup-dev at fluffy.co.uk]

Author: chris
Date: 2007-07-26 23:07:59 +0100 (Thu, 26 Jul 2007)
New Revision: 1775

Modified:
   box/chris/merge/lib/raidfile/RaidFileController.cpp
   box/chris/merge/lib/raidfile/RaidFileController.h
Log:
Make RaidFileController::Initialise take a std::string instead of a
char array, in C++ style. (refs #3, merges [1683])


Modified: box/chris/merge/lib/raidfile/RaidFileController.cpp
===================================================================
--- box/chris/merge/lib/raidfile/RaidFileController.cpp	2007-07-26 22:07:24 UTC (rev 1774)
+++ box/chris/merge/lib/raidfile/RaidFileController.cpp	2007-07-26 22:07:59 UTC (rev 1775)
@@ -59,12 +59,12 @@
 // --------------------------------------------------------------------------
 //
 // Function
-//		Name:    RaidFileController::Initialise(const char *)
+//		Name:    RaidFileController::Initialise(const std::string&)
 //		Purpose: Initialises the system, loading the configuration file.
 //		Created: 2003/07/08
 //
 // --------------------------------------------------------------------------
-void RaidFileController::Initialise(const char *ConfigFilename)
+void RaidFileController::Initialise(const std::string& rConfigFilename)
 {
 	MEMLEAKFINDER_NO_LEAKS;
 
@@ -97,11 +97,13 @@
 	
 	// Load the configuration
 	std::string err;
-	std::auto_ptr<Configuration> pconfig = Configuration::LoadAndVerify(ConfigFilename, &verify, err);
+	std::auto_ptr<Configuration> pconfig = Configuration::LoadAndVerify(
+		rConfigFilename, &verify, err);
 	
 	if(pconfig.get() == 0 || !err.empty())
 	{
-		fprintf(stderr, "RaidFile configuation file errors:\n%s", err.c_str());
+		fprintf(stderr, "RaidFile configuation file errors:\n%s",
+			err.c_str());
 		THROW_EXCEPTION(RaidFileException, BadConfigFile)
 	}
 	

Modified: box/chris/merge/lib/raidfile/RaidFileController.h
===================================================================
--- box/chris/merge/lib/raidfile/RaidFileController.h	2007-07-26 22:07:24 UTC (rev 1774)
+++ box/chris/merge/lib/raidfile/RaidFileController.h	2007-07-26 22:07:59 UTC (rev 1775)
@@ -81,7 +81,8 @@
 	~RaidFileController();
 	
 public:
-	void Initialise(const char *ConfigFilename = "/etc/box/raidfile.conf");
+	void Initialise(const std::string& rConfigFilename = 
+		"/etc/box/raidfile.conf");
 	int GetNumDiscSets() {return mSetList.size();}
 
 	// --------------------------------------------------------------------------