From c28d785a73b49d1aaab3cce21ae1a5b04d991cd0 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 6 Aug 2019 11:54:14 +0200
Subject: [PATCH] STYLE: adjust name, default count for
 readRawLabel/readRawScalar (#1378)

---
 applications/test/primitives/Test-primitives.C | 2 +-
 src/OpenFOAM/primitives/Scalar/scalar/scalar.C | 4 ++--
 src/OpenFOAM/primitives/Scalar/scalar/scalar.H | 8 ++++----
 src/OpenFOAM/primitives/ints/label/label.C     | 4 ++--
 src/OpenFOAM/primitives/ints/label/label.H     | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/applications/test/primitives/Test-primitives.C b/applications/test/primitives/Test-primitives.C
index e46e700f20..23f52a61e5 100644
--- a/applications/test/primitives/Test-primitives.C
+++ b/applications/test/primitives/Test-primitives.C
@@ -340,7 +340,7 @@ int main(int argc, char *argv[])
         // {
         //     val = readRawScalar(is);
         // }
-        readRawScalars(is, dstList.data(), dstList.size());
+        readRawScalar(is, dstList.data(), dstList.size());
         is.endRawRead();
 
         Info<< "Wrote " << flatOutput(srcList) << nl
diff --git a/src/OpenFOAM/primitives/Scalar/scalar/scalar.C b/src/OpenFOAM/primitives/Scalar/scalar/scalar.C
index 7a60f9911b..9dd2387726 100644
--- a/src/OpenFOAM/primitives/Scalar/scalar/scalar.C
+++ b/src/OpenFOAM/primitives/Scalar/scalar/scalar.C
@@ -40,12 +40,12 @@ Foam::scalar Foam::readScalar(Istream& is)
 Foam::scalar Foam::readRawScalar(Istream& is)
 {
     scalar val(0);
-    readRawScalars(is, &val, 1);
+    readRawScalar(is, &val, 1);
     return val;
 }
 
 
-void Foam::readRawScalars(Istream& is, scalar* data, size_t nElem)
+void Foam::readRawScalar(Istream& is, scalar* data, size_t nElem)
 {
     // No check for binary vs ascii, the caller knows what they are doing
 
diff --git a/src/OpenFOAM/primitives/Scalar/scalar/scalar.H b/src/OpenFOAM/primitives/Scalar/scalar/scalar.H
index f0844babda..7647d009e8 100644
--- a/src/OpenFOAM/primitives/Scalar/scalar/scalar.H
+++ b/src/OpenFOAM/primitives/Scalar/scalar/scalar.H
@@ -92,10 +92,10 @@ namespace Foam
     //        the caller knows what they are doing
     scalar readRawScalar(Istream& is);
 
-    //- Read raw scalars from binary stream.
+    //- Read raw scalar(s) from binary stream.
     //  \note No internal check for binary vs ascii,
     //        the caller knows what they are doing
-    void readRawScalars(Istream& is, scalar* data, size_t nElem);
+    void readRawScalar(Istream& is, scalar* data, size_t nElem = 1);
 }
 
 #elif defined(WM_DP)
@@ -144,10 +144,10 @@ namespace Foam
     //        the caller knows what they are doing
     scalar readRawScalar(Istream& is);
 
-    //- Read raw scalars from binary stream.
+    //- Read raw scalar(s) from binary stream.
     //  \note No internal check for binary vs ascii,
     //        the caller knows what they are doing
-    void readRawScalars(Istream& is, scalar* data, size_t nElem);
+    void readRawScalar(Istream& is, scalar* data, size_t nElem = 1);
 }
 
 #endif
diff --git a/src/OpenFOAM/primitives/ints/label/label.C b/src/OpenFOAM/primitives/ints/label/label.C
index e0c7afb2da..c9db5fe2a5 100644
--- a/src/OpenFOAM/primitives/ints/label/label.C
+++ b/src/OpenFOAM/primitives/ints/label/label.C
@@ -45,12 +45,12 @@ const char* const Foam::pTraits<int64_t>::typeName = "label";
 Foam::label Foam::readRawLabel(Istream& is)
 {
     label val(0);
-    readRawLabels(is, &val, 1);
+    readRawLabel(is, &val, 1);
     return val;
 }
 
 
-void Foam::readRawLabels(Istream& is, label* data, size_t nElem)
+void Foam::readRawLabel(Istream& is, label* data, size_t nElem)
 {
     // No check for binary vs ascii, the caller knows what they are doing
 
diff --git a/src/OpenFOAM/primitives/ints/label/label.H b/src/OpenFOAM/primitives/ints/label/label.H
index 3e209a3dd3..f2c7bf6ff9 100644
--- a/src/OpenFOAM/primitives/ints/label/label.H
+++ b/src/OpenFOAM/primitives/ints/label/label.H
@@ -108,10 +108,10 @@ inline label readLabel(Istream& is)
 //        the caller knows what they are doing
 label readRawLabel(Istream& is);
 
-//- Read raw labels from binary stream.
+//- Read raw label(s) from binary stream.
 //  \note No internal check for binary vs ascii,
 //        the caller knows what they are doing
-void readRawLabels(Istream& is, label* data, size_t nElem);
+void readRawLabel(Istream& is, label* data, size_t nElem = 1);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //