STYLE: drop dubious string::expand recursion

- was used for on-the-fly, but not needed anymore

src/OpenFOAM/primitives/strings/string/string.C

@@ -93,8 +93,7 @@ Foam::string& Foam::string::replaceAll
 }
 
 
-// Expand all occurences of environment variables and initial tilde sequences
+Foam::string& Foam::string::expand(const bool allowEmpty)
-Foam::string& Foam::string::expand(const bool recurse, const bool allowEmptyVar)
 {
     size_type begVar = 0;
 
@@ -134,20 +133,15 @@ Foam::string& Foam::string::expand(const bool recurse, const bool allowEmptyVar)
 
             if (endVar != npos && endVar != begVar)
             {
-                string varName = substr
+                const string varName = substr
                 (
                     begVar + 1 + delim,
                     endVar - begVar - 2*delim
                 );
 
-                string varValue = getEnv(varName);
+                const string varValue = getEnv(varName);
-
                 if (varValue.size())
                 {
-                    if (recurse)
-                    {
-                        varValue.expand(recurse, allowEmptyVar);
-                    }
                     std::string::replace
                     (
                         begVar,
@@ -156,7 +150,7 @@ Foam::string& Foam::string::expand(const bool recurse, const bool allowEmptyVar)
                     );
                     begVar += varValue.size();
                 }
-                else if (allowEmptyVar)
+                else if (allowEmpty)
                 {
                     std::string::replace
                     (

src/OpenFOAM/primitives/strings/string/string.H

@@ -180,13 +180,10 @@ public:
         //    - leading "~user" : home directory for specified user
         //    - leading "~OpenFOAM" : site/user OpenFOAM configuration directory
         //
+        //  Any unknown entries are removed silently if allowEmpty is true
         //  \sa
         //  Foam::findEtcFile
-        string& expand
+        string& expand(const bool allowEmpty = false);
-        (
-            const bool recurse=false,
-            const bool allowEmptyVar = false
-        );
 
         //- Remove repeated characters returning true if string changed
         bool removeRepeated(const char);