[C#] Tidy up after merge of PR #845.

Author: mjpt777

csharp/sbe-benchmarks/Bench/SBE/CarBenchmark.cs

@@ -184,7 +184,7 @@ public int Decode(Car car, DirectBuffer directBuffer, int bufferOffset)
             while (performanceFiguresGroup.HasNext)
             {
                 performanceFiguresGroup.Next();
-                var octanceRating = performanceFiguresGroup.OctaneRating;
+                var octaneRating = performanceFiguresGroup.OctaneRating;
 
                 var accelerationGroup = performanceFiguresGroup.Acceleration;
                 for (int i = 0; i < accelerationGroup.Count; i++)

csharp/sbe-benchmarks/Bench/SBE/CarBenchmark_with_strings_new.cs

@@ -9,7 +9,6 @@ namespace Org.SbeTool.Sbe.Benchmarks.Bench.Benchmarks
     [MemoryDiagnoser]
     public class CarBenchmark_with_strings_new
     {
-
         private readonly byte[] _eBuffer = new byte[1024];
         private readonly byte[] _dBuffer = new byte[1024];
         private DirectBuffer _encodeBuffer;
@@ -173,7 +172,7 @@ public int Decode(Car car, DirectBuffer directBuffer, int bufferOffset)
             while (performanceFiguresGroup.HasNext)
             {
                 performanceFiguresGroup.Next();
-                var octanceRating = performanceFiguresGroup.OctaneRating;
+                var octaneRating = performanceFiguresGroup.OctaneRating;
 
                 var accelerationGroup = performanceFiguresGroup.Acceleration;
                 for (int i = 0; i < accelerationGroup.Count; i++)
@@ -187,6 +186,7 @@ public int Decode(Car car, DirectBuffer directBuffer, int bufferOffset)
             var man = car.GetManufacturer();
             var model = car.GetModel();
             var actCode = car.GetActivationCode();
+
             return car.Size;
         }
     }

csharp/sbe-benchmarks/Bench/SBE/CarBenchmark_with_strings_original.cs

@@ -9,15 +9,13 @@ namespace Org.SbeTool.Sbe.Benchmarks.Bench.Benchmarks
     [MemoryDiagnoser]
     public class CarBenchmark_with_strings_original
     {
-
         private static readonly Encoding VehicleCodeEncoding = Encoding.GetEncoding(Car.VehicleCodeCharacterEncoding);
         private static readonly Encoding ManufacturerCodeEncoding = Encoding.GetEncoding(Engine.ManufacturerCodeCharacterEncoding);
         private static readonly Encoding ManufacturerEncoding = Encoding.GetEncoding(Car.ManufacturerCharacterEncoding);
         private static readonly Encoding ModelEncoding = Encoding.GetEncoding(Car.ModelCharacterEncoding);
         private static readonly Encoding ActivationCodeEncoding = Encoding.GetEncoding(Car.ActivationCodeCharacterEncoding);
         private static readonly Encoding UsageDescriptionEncoding = Encoding.GetEncoding(Car.FuelFiguresGroup.UsageDescriptionCharacterEncoding);
 
-
         private readonly byte[] _eBuffer = new byte[1024];
         private readonly byte[] _dBuffer = new byte[1024];
         private DirectBuffer _encodeBuffer;
@@ -187,7 +185,7 @@ public int Decode(Car car, DirectBuffer directBuffer, int bufferOffset)
             while (performanceFiguresGroup.HasNext)
             {
                 performanceFiguresGroup.Next();
-                var octanceRating = performanceFiguresGroup.OctaneRating;
+                var octaneRating = performanceFiguresGroup.OctaneRating;
 
                 var accelerationGroup = performanceFiguresGroup.Acceleration;
                 for (int i = 0; i < accelerationGroup.Count; i++)

csharp/sbe-benchmarks/Bench/SBE/MarketDataBenchmark.cs

@@ -103,4 +103,4 @@ public int Decode(DirectBuffer buffer, int bufferOffset)
             return _marketData.Size;
         }
     }
-}
+}

csharp/sbe-dll/DirectBuffer.cs

@@ -657,23 +657,22 @@ public int SetBytes(int index, ReadOnlySpan<byte> src)
 
         /// <summary>
         /// Writes a string into the underlying buffer, encoding using the provided <see cref="System.Text.Encoding"/>.
-        /// If there is not enough room in the buffer for the bytes it will throw IndexOutOfRangeExcpetion.
+        /// If there is not enough room in the buffer for the bytes it will throw IndexOutOfRangeException.
         /// </summary>
         /// <param name="encoding">encoding to use to write the bytes from the string</param>
         /// <param name="src">source string</param>
         /// <param name="index">index in the underlying buffer to start writing bytes</param>
         /// <returns>count of bytes written</returns>
         public unsafe int SetBytesFromString(Encoding encoding, string src, int index)
         {
-
            int available = _capacity - index;
-
            int byteCount = encoding.GetByteCount(src);
 
            if (byteCount > available)
            {
                ThrowHelper.ThrowIndexOutOfRangeException(_capacity);
            }
+
            fixed (char* ptr = src)
            {
                return encoding.GetBytes(ptr, src.Length, _pBuffer + index, byteCount);
@@ -686,7 +685,7 @@ public unsafe int SetBytesFromString(Encoding encoding, string src, int index)
         /// If there are not enough bytes in the buffer it will throw an IndexOutOfRangeException.
         /// </summary>
         /// <param name="encoding">encoding to use to convert the bytes into characters</param>
-        /// <param name="index">index in theunderlying buffer to start writing bytes</param>
+        /// <param name="index">index in the underlying buffer to start writing bytes</param>
         /// <param name="byteCount">the number of bytes to read into the string</param>
         /// <returns>the string representing the decoded bytes read from the buffer</returns>
         public string GetStringFromBytes(Encoding encoding, int index, int byteCount)
@@ -715,14 +714,17 @@ public unsafe string GetStringFromNullTerminatedBytes(Encoding encoding, int ind
             {
                 ThrowHelper.ThrowIndexOutOfRangeException(index);
             }
+
             if (_pBuffer[index] == nullByte)
             {
                 return null;
             }
+
             int byteCount2 = 0;
             for (byteCount2 = 0; byteCount2 < count && _pBuffer[byteCount2 + index] != nullByte; byteCount2++)
             { 
             }
+
             return new String((sbyte*) _pBuffer, index, byteCount2, encoding);
         }
 
@@ -743,25 +745,30 @@ public unsafe int SetNullTerminatedBytesFromString(Encoding encoding, string src
             {
                 ThrowHelper.ThrowIndexOutOfRangeException(index);
             }
+
             if (src == null)
             {
                 _pBuffer[index] = nullByte;
                 return 1;
             }
+
             int byteCount = encoding.GetByteCount(src);
             if (byteCount > available)
             {
                 ThrowHelper.ThrowIndexOutOfRangeException(index + available);
             }
+
             fixed (char* ptr = src)
             {
                 encoding.GetBytes(ptr, src.Length, _pBuffer + index, byteCount);
             }
+
             if (byteCount < available)
             {
                 *(_pBuffer + index + byteCount) = nullByte;
                 return byteCount + 1;
             }
+
             return byteCount;
         }
 

csharp/sbe-dll/EndianessConverter.cs

@@ -8,7 +8,8 @@ namespace Org.SbeTool.Sbe.Dll
     /// </summary>
     public static class EndianessConverter
     {
-        // TODO: we could assume the system is always little endian and have two methods for each (one no-op and another one which reverse, so we do not have branching)
+        // TODO: we could assume the system is always little endian and have two methods for each
+        // TODO: (one no-op and another one which reverse, so we do not have branching)
 
         private static readonly ByteOrder NativeByteOrder = BitConverter.IsLittleEndian
             ? ByteOrder.LittleEndian

csharp/sbe-dll/PrimitiveType.cs

@@ -208,4 +208,4 @@ public SbePrimitiveType Type
             get { return _sbePrimitiveType; }
         }
     }
-}
+}

csharp/sbe-dll/PrimitiveValue.cs

@@ -104,7 +104,6 @@ private enum Representation
         #endregion
 
 
-
         /// <summary>
         /// Minimum value for INT8 SBE type
         /// </summary>
@@ -537,4 +536,4 @@ public override int GetHashCode()
             }
         }
     }
-}
+}

csharp/sbe-dll/SbePrimitiveType.cs

@@ -60,4 +60,4 @@ public enum SbePrimitiveType
         /// </summary>
         Double
     }
-}
+}

csharp/sbe-dll/sbe-tool.sh

@@ -3,7 +3,6 @@
 ROOTDIR=$(dirname ${0})
 SBE_JAR=${ROOTDIR}/sbe-tool-all.jar
 
-
 [ -f "${SBE_JAR}" ] || (echo "Missing ${SBE_JAR}"; exit 1)
 
 function usage {