add ThrowHelper.ThrowIfNegative

Author: Rob-Hague

src/Renci.SshNet/Common/PacketDump.cs

@@ -15,11 +15,7 @@ public static string Create(List<byte> data, int indentLevel)
         public static string Create(byte[] data, int indentLevel)
         {
             ThrowHelper.ThrowIfNull(data);
-
-            if (indentLevel < 0)
-            {
-                throw new ArgumentOutOfRangeException(nameof(indentLevel), "Cannot be less than zero.");
-            }
+            ThrowHelper.ThrowIfNegative(indentLevel);
 
             const int lineWidth = 16;
 

src/Renci.SshNet/Common/ThrowHelper.cs

@@ -87,31 +87,39 @@ static void Throw(string? argument, string? paramName)
         public static void ValidateBufferArguments(byte[] buffer, int offset, int count)
         {
             ThrowIfNull(buffer);
+            ThrowIfNegative(offset);
 
-            if (offset < 0)
+            if ((uint)count > buffer.Length - offset)
             {
                 Throw();
 
                 [DoesNotReturn]
                 static void Throw()
                 {
-                    throw new ArgumentOutOfRangeException(nameof(offset), "Non-negative number required.");
+                    throw new ArgumentOutOfRangeException(
+                        nameof(count),
+                        "Offset and length were out of bounds for the array or count is greater than the number of elements from index to the end of the source collection.");
                 }
             }
+        }
+#endif
 
-            if ((uint)count > buffer.Length - offset)
+        public static void ThrowIfNegative(long value, [CallerArgumentExpression(nameof(value))] string? paramName = null)
+        {
+#if NET
+            ArgumentOutOfRangeException.ThrowIfNegative(value, paramName);
+#else
+            if (value < 0)
             {
-                Throw();
+                Throw(value, paramName);
 
                 [DoesNotReturn]
-                static void Throw()
+                static void Throw(long value, string? paramName)
                 {
-                    throw new ArgumentOutOfRangeException(
-                        nameof(count),
-                        "Offset and length were out of bounds for the array or count is greater than the number of elements from index to the end of the source collection.");
+                    throw new ArgumentOutOfRangeException(paramName, value, "Value must be non-negative.");
                 }
             }
-        }
 #endif
+        }
     }
 }

src/Renci.SshNet/Sftp/SftpFileStream.cs

@@ -922,14 +922,7 @@ public override long Seek(long offset, SeekOrigin origin)
         /// </remarks>
         public override void SetLength(long value)
         {
-#if NET
-            ArgumentOutOfRangeException.ThrowIfNegative(value);
-#else
-            if (value < 0)
-            {
-                throw new ArgumentOutOfRangeException(nameof(value));
-            }
-#endif
+            ThrowHelper.ThrowIfNegative(value);
 
             // Lock down the file stream while we do this.
             lock (_lock)

test/Renci.SshNet.Tests/Classes/Common/PacketDumpTest.cs

@@ -41,8 +41,6 @@ public void Create_ByteArrayAndIndentLevel_IndentLevelLessThanZero()
             {
                 Assert.IsNull(ex.InnerException);
 
-                ArgumentExceptionAssert.MessageEquals("Cannot be less than zero.", ex);
-
                 Assert.AreEqual("indentLevel", ex.ParamName);
             }
         }