From f4a84af4650697d23d3cbe5b8b8f0341071aecb0 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 23 Feb 2011 10:23:50 +0100 Subject: [PATCH] STYLE: trim both ends of codeStream entries - improves consistency of SHA1 calculation --- .../db/dictionary/functionEntries/codeStream/codeStream.C | 6 +++--- .../codedFixedValue/codedFixedValueFvPatchScalarField.C | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C b/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C index af3904759d..1accc97517 100644 --- a/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C +++ b/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C @@ -93,18 +93,18 @@ bool Foam::functionEntries::codeStream::execute string codeInclude; if (codeDict.found("codeInclude")) { - codeInclude = stringOps::trimLeft(codeDict["codeInclude"]); + codeInclude = stringOps::trim(codeDict["codeInclude"]); } // "codeOptions" is optional string codeOptions; if (codeDict.found("codeOptions")) { - codeOptions = stringOps::trimLeft(codeDict["codeOptions"]); + codeOptions = stringOps::trim(codeDict["codeOptions"]); } // "code" is mandatory - string code = stringOps::trimLeft(codeDict["code"]); + string code = stringOps::trim(codeDict["code"]); // Create SHA1 digest from the contents SHA1Digest sha; diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchScalarField.C index 9ab2ba1368..b87a560ac0 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchScalarField.C @@ -95,18 +95,18 @@ void Foam::codedFixedValueFvPatchScalarField::writeLibrary string codeInclude; if (dict.found("codeInclude")) { - codeInclude = stringOps::trimLeft(dict["codeInclude"]); + codeInclude = stringOps::trim(dict["codeInclude"]); } // "codeOptions" is optional string codeOptions; if (dict.found("codeOptions")) { - codeOptions = stringOps::trimLeft(dict["codeOptions"]); + codeOptions = stringOps::trim(dict["codeOptions"]); } // "code" is mandatory - string code = stringOps::trimLeft(dict["code"]); + string code = stringOps::trim(dict["code"]); // Create SHA1 digest from the contents SHA1Digest sha;