[OMPT-svn-commit] SF.net SVN: modplug:[5346] trunk/OpenMPT

[<man...@us...>]

Revision: 5346
          http://sourceforge.net/p/modplug/code/5346
Author:   manxorist
Date:     2015-06-19 18:43:50 +0000 (Fri, 19 Jun 2015)
Log Message:
-----------
[Ref] std::getenv is cumbersome. Provide a wrapper, mpt::getenv, with a saner interface.

Modified Paths:
--------------
    trunk/OpenMPT/common/misc_util.cpp
    trunk/OpenMPT/common/misc_util.h
    trunk/OpenMPT/mptrack/TrackerSettings.cpp
    trunk/OpenMPT/test/test.cpp

Modified: trunk/OpenMPT/common/misc_util.cpp
===================================================================
--- trunk/OpenMPT/common/misc_util.cpp	2015-06-19 18:20:20 UTC (rev 5345)
+++ trunk/OpenMPT/common/misc_util.cpp	2015-06-19 18:43:50 UTC (rev 5346)
@@ -131,4 +131,21 @@
 } // namespace Util
 
 
+namespace mpt
+{
+
+std::string getenv(const std::string &env_var, const std::string &def)
+//--------------------------------------------------------------------
+{
+	const char *val = std::getenv(env_var.c_str());
+	if(!val)
+	{
+		return def;
+	}
+	return val;
+}
+
+} // namespace mpt
+
+
 OPENMPT_NAMESPACE_END

Modified: trunk/OpenMPT/common/misc_util.h
===================================================================
--- trunk/OpenMPT/common/misc_util.h	2015-06-19 18:20:20 UTC (rev 5345)
+++ trunk/OpenMPT/common/misc_util.h	2015-06-19 18:43:50 UTC (rev 5346)
@@ -607,4 +607,15 @@
 } // namespace Util
 
 
+namespace mpt
+{
+
+// Wrapper around std::getenv.
+// Instead of returning null pointer if the environment variable is not set,
+// this wrapper returns the provided default value.
+std::string getenv(const std::string &env_var, const std::string &def = std::string());
+
+} // namespace mpt
+
+
 OPENMPT_NAMESPACE_END

Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.cpp	2015-06-19 18:20:20 UTC (rev 5345)
+++ trunk/OpenMPT/mptrack/TrackerSettings.cpp	2015-06-19 18:43:50 UTC (rev 5346)
@@ -300,7 +300,7 @@
 	, PathUserTemplates(theApp.GetConfigPath() + MPT_PATHSTRING("TemplateModules\\"))
 	// Default template
 	, defaultTemplateFile(conf, "Paths", "DefaultTemplate", mpt::PathString())
-	, defaultArtist(conf, "Misc", "DefaultArtist", mpt::ToUnicode(mpt::CharsetLocale, std::getenv("USERNAME") ? std::getenv("USERNAME") : std::string()))
+	, defaultArtist(conf, "Misc", "DefaultArtist", mpt::ToUnicode(mpt::CharsetLocale, mpt::getenv("USERNAME")))
 	// MRU List
 	, mruListLength(conf, "Misc", "MRUListLength", 10)
 	// Plugins

Modified: trunk/OpenMPT/test/test.cpp
===================================================================
--- trunk/OpenMPT/test/test.cpp	2015-06-19 18:20:20 UTC (rev 5345)
+++ trunk/OpenMPT/test/test.cpp	2015-06-19 18:43:50 UTC (rev 5346)
@@ -122,7 +122,7 @@
 		std::string pathprefix = std::string();
 
 		// set path prefix for test files (if provided)
-		std::string env_srcdir = std::getenv( "srcdir" ) ? std::getenv( "srcdir" ) : std::string();
+		std::string env_srcdir = mpt::getenv( "srcdir" );
 		if ( !env_srcdir.empty() ) {
 			pathprefix = env_srcdir;
 		}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.