X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fepa.cc;h=4af2029308559273775c628cd058a4180fffc7d7;hb=d3738b087ef1698d45e140114feb8fca4d31e42f;hp=0fc386072fa72c7e4deafeaf5f2151e70b5ffd4a;hpb=ad017365f7a73f8ba57f667cc1aa36478b48c50e;p=ardour.git diff --git a/libs/pbd/epa.cc b/libs/pbd/epa.cc index 0fc386072f..4af2029308 100644 --- a/libs/pbd/epa.cc +++ b/libs/pbd/epa.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2010 Paul Davis + Copyright (C) 2010 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -64,7 +64,7 @@ EnvironmentalProtectionAgency::save () e.clear (); if (!_envname.empty()) { - + /* fetch environment from named environment variable, rather than "environ" */ @@ -73,8 +73,8 @@ EnvironmentalProtectionAgency::save () if (!estr) { return; } - - /* parse line by line, and save into "e" + + /* parse line by line, and save into "e" */ vector lines; @@ -84,40 +84,40 @@ EnvironmentalProtectionAgency::save () string estring = *i; string::size_type equal = estring.find_first_of ('='); - + if (equal == string::npos) { /* say what? an environ value without = ? */ continue; } - + string before = estring.substr (0, equal); string after = estring.substr (equal+1); - + e.insert (pair(before,after)); } - + } else { /* fetch environment from "environ" */ for (size_t i = 0; environ[i]; ++i) { - + string estring = environ[i]; string::size_type equal = estring.find_first_of ('='); - + if (equal == string::npos) { /* say what? an environ value without = ? */ continue; } - + string before = estring.substr (0, equal); string after = estring.substr (equal+1); - + e.insert (pair(before,after)); } } -} +} void EnvironmentalProtectionAgency::restore () const { @@ -126,7 +126,7 @@ EnvironmentalProtectionAgency::restore () const for (map::const_iterator i = e.begin(); i != e.end(); ++i) { g_setenv (i->first.c_str(), i->second.c_str(), 1); } -} +} void EnvironmentalProtectionAgency::clear () const @@ -144,12 +144,12 @@ EnvironmentalProtectionAgency::clear () const for (vector::const_iterator e = ecopy.begin(); e != ecopy.end(); ++e) { string::size_type equal = (*e).find_first_of ('='); - + if (equal == string::npos) { /* say what? an environ value without = ? */ continue; } - + string var_name = (*e).substr (0, equal); g_unsetenv(var_name.c_str()); }