From b4e88f260b5aa3b8fd25bfe4d261789f9d062db6 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://openfoam.org>
Date: Tue, 11 Jul 2017 15:11:38 +0100
Subject: [PATCH] masterUncollatedFileOperation: Updated to avoid warning from
 clang

---
 .../parallelProcessing/decomposePar/decomposePar.C   |  3 ++-
 .../masterUncollatedFileOperation.C                  | 12 +++++++++---
 .../uncollatedFileOperation.C                        |  6 +++---
 .../uncollatedFileOperation.H                        |  2 +-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index ec477b8ff..635fac75a 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -526,7 +526,8 @@ int main(int argc, char *argv[])
                     << endl;
             }
 
-            fileOperations::collatedFileOperation::maxThreadFileBufferSize = bufSz;
+            fileOperations::collatedFileOperation::maxThreadFileBufferSize =
+                bufSz;
         }
 
 
diff --git a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
index 757744c23..17e88b7cb 100644
--- a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
@@ -459,7 +459,8 @@ masterUncollatedFileOperation
     if (verbose)
     {
         Info<< "I/O    : " << typeName
-            << " (maxMasterFileBufferSize " << maxMasterFileBufferSize << ')' << endl;
+            << " (maxMasterFileBufferSize " << maxMasterFileBufferSize << ')'
+            << endl;
     }
 
     if (regIOobject::fileModificationChecking == regIOobject::timeStampMaster)
@@ -703,8 +704,9 @@ Foam::fileName Foam::fileOperations::masterUncollatedFileOperation::filePath
     // Determine master filePath and scatter
 
     fileName objPath;
-    pathType searchType;
+    pathType searchType = NOTFOUND;
     word newInstancePath;
+
     if (Pstream::master())
     {
         objPath = filePathInfo
@@ -716,11 +718,13 @@ Foam::fileName Foam::fileOperations::masterUncollatedFileOperation::filePath
             newInstancePath
         );
     }
+
     {
         label masterType(searchType);
         Pstream::scatter(masterType);
         searchType = pathType(masterType);
     }
+
     Pstream::scatter(newInstancePath);
 
 
@@ -780,8 +784,9 @@ Foam::fileName Foam::fileOperations::masterUncollatedFileOperation::dirPath
     // Determine master dirPath and scatter
 
     fileName objPath;
-    pathType searchType;
+    pathType searchType = NOTFOUND;
     word newInstancePath;
+
     if (Pstream::master())
     {
         objPath = filePathInfo
@@ -793,6 +798,7 @@ Foam::fileName Foam::fileOperations::masterUncollatedFileOperation::dirPath
             newInstancePath
         );
     }
+
     {
         label masterType(searchType);
         Pstream::scatter(masterType);
diff --git a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C
index 2cc81f34f..ca111c226 100644
--- a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.C
@@ -46,7 +46,7 @@ namespace fileOperations
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-Foam::fileName Foam::fileOperations::uncollatedFileOperation::doFilePath
+Foam::fileName Foam::fileOperations::uncollatedFileOperation::filePathInfo
 (
     const bool checkGlobal,
     const bool isFile,
@@ -357,7 +357,7 @@ Foam::fileName Foam::fileOperations::uncollatedFileOperation::filePath
             << " checkGlobal:" << checkGlobal << endl;
     }
 
-    fileName objPath(doFilePath(checkGlobal, true, io));
+    fileName objPath(filePathInfo(checkGlobal, true, io));
 
     if (debug)
     {
@@ -383,7 +383,7 @@ Foam::fileName Foam::fileOperations::uncollatedFileOperation::dirPath
             << " checkGlobal:" << checkGlobal << endl;
     }
 
-    fileName objPath(doFilePath(checkGlobal, false, io));
+    fileName objPath(filePathInfo(checkGlobal, false, io));
 
     if (debug)
     {
diff --git a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.H b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.H
index f63820183..9ff5e55b3 100644
--- a/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.H
@@ -55,7 +55,7 @@ class uncollatedFileOperation
         //- Search for an object.
         //    checkGlobal : also check undecomposed case
         //    isFile      : true:check for file  false:check for directory
-        fileName doFilePath
+        fileName filePathInfo
         (
             const bool checkGlobal,
             const bool isFile,