mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.6.0.182

Browse Source 
Former-commit-id: 439c182e520038bf50777ca2fe684f216ae28552
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-09-01 10:46:18 +00:00
parent c911219690
commit 804b15604f
118 changed files with 1007 additions and 891 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
mcs/class/System/System.IO.Compression/DeflateStream.cs
View File

@@ -52,13 +52,13 @@ namespace System.IO.Compression
bool disposed;
DeflateStreamNative native;
public DeflateStream (Stream compressedStream, CompressionMode mode) :
this (compressedStream, mode, false, false)
public DeflateStream (Stream stream, CompressionMode mode) :
this (stream, mode, false, false)
{
}
public DeflateStream (Stream compressedStream, CompressionMode mode, bool leaveOpen) :
this (compressedStream, mode, leaveOpen, false)
public DeflateStream (Stream stream, CompressionMode mode, bool leaveOpen) :
this (stream, mode, leaveOpen, false)
{
}
@@ -124,23 +124,23 @@ namespace System.IO.Compression
}
}
public override int Read (byte[] dest, int dest_offset, int count)
public override int Read (byte[] array, int offset, int count)
{
if (disposed)
throw new ObjectDisposedException (GetType ().FullName);
if (dest == null)
if (array == null)
throw new ArgumentNullException ("Destination array is null.");
if (!CanRead)
throw new InvalidOperationException ("Stream does not support reading.");
int len = dest.Length;
if (dest_offset < 0 || count < 0)
int len = array.Length;
if (offset < 0 || count < 0)
throw new ArgumentException ("Dest or count is negative.");
if (dest_offset > len)
if (offset > len)
throw new ArgumentException ("destination offset is beyond array size");
if ((dest_offset + count) > len)
if ((offset + count) > len)
throw new ArgumentException ("Reading would overrun buffer");
return ReadInternal (dest, dest_offset, count);
return ReadInternal (array, offset, count);
}
unsafe void WriteInternal (byte[] array, int offset, int count)
@@ -154,16 +154,16 @@ namespace System.IO.Compression
}
}
public override void Write (byte[] src, int src_offset, int count)
public override void Write (byte[] array, int offset, int count)
{
if (disposed)
throw new ObjectDisposedException (GetType ().FullName);
if (src == null)
throw new ArgumentNullException ("src");
if (array == null)
throw new ArgumentNullException ("array");
if (src_offset < 0)
throw new ArgumentOutOfRangeException ("src_offset");
if (offset < 0)
throw new ArgumentOutOfRangeException ("offset");
if (count < 0)
throw new ArgumentOutOfRangeException ("count");
@@ -171,10 +171,10 @@ namespace System.IO.Compression
if (!CanWrite)
throw new NotSupportedException ("Stream does not support writing");
if (src_offset > src.Length - count)
if (offset > array.Length - count)
throw new ArgumentException ("Buffer too small. count/offset wrong.");
WriteInternal (src, src_offset, count);
WriteInternal (array, offset, count);
}
public override void Flush ()

8
mcs/class/System/System.IO.Compression/GZipStream.cs
View File

@@ -70,21 +70,21 @@ namespace System.IO.Compression {
base.Dispose (disposing);
}
public override int Read (byte[] dest, int dest_offset, int count)
public override int Read (byte[] array, int offset, int count)
{
if (deflateStream == null)
throw new ObjectDisposedException (GetType ().FullName);
return deflateStream.Read(dest, dest_offset, count);
return deflateStream.Read(array, offset, count);
}
public override void Write (byte[] src, int src_offset, int count)
public override void Write (byte[] array, int offset, int count)
{
if (deflateStream == null)
throw new ObjectDisposedException (GetType ().FullName);
deflateStream.Write (src, src_offset, count);
deflateStream.Write (array, offset, count);
}
public override void Flush()

2
mcs/class/System/System.Net.Sockets/Socket.cs.REMOVED.git-id
View File

@@ -1 +1 @@
f894f490612fc2b6ff9f185bd113be8941234c9b
3dd17d0c16ba42ad68b52821e4491c8eafe06c04

8
mcs/class/System/System.Security.AccessControl/SemaphoreAccessRule.cs
View File

@@ -34,16 +34,16 @@ namespace System.Security.AccessControl {
public sealed class SemaphoreAccessRule : AccessRule
{
public SemaphoreAccessRule (IdentityReference identity,
SemaphoreRights semaphoreRights,
SemaphoreRights eventRights,
AccessControlType type)
: base (identity, (int)semaphoreRights, false, InheritanceFlags.None, PropagationFlags.None, type)
: base (identity, (int)eventRights, false, InheritanceFlags.None, PropagationFlags.None, type)
{
}
public SemaphoreAccessRule (string identity,
SemaphoreRights semaphoreRights,
SemaphoreRights eventRights,
AccessControlType type)
: this (new NTAccount (identity), semaphoreRights, type)
: this (new NTAccount (identity), eventRights, type)
{
}

4
mcs/class/System/System.Security.AccessControl/SemaphoreAuditRule.cs
View File

@@ -35,9 +35,9 @@ namespace System.Security.AccessControl {
: AuditRule
{
public SemaphoreAuditRule (IdentityReference identity,
SemaphoreRights semaphoreRights,
SemaphoreRights eventRights,
AuditFlags flags)
: base (identity, (int)semaphoreRights, false, InheritanceFlags.None, PropagationFlags.None, flags)
: base (identity, (int)eventRights, false, InheritanceFlags.None, PropagationFlags.None, flags)
{
}

10
mcs/class/System/System.Security.Cryptography.X509Certificates/X509KeyUsageExtension.cs
View File

@@ -94,14 +94,14 @@ namespace System.Security.Cryptography.X509Certificates {
// methods
public override void CopyFrom (AsnEncodedData encodedData)
public override void CopyFrom (AsnEncodedData asnEncodedData)
{
if (encodedData == null)
throw new ArgumentNullException ("encodedData");
if (asnEncodedData == null)
throw new ArgumentNullException ("asnEncodedData");
X509Extension ex = (encodedData as X509Extension);
X509Extension ex = (asnEncodedData as X509Extension);
if (ex == null)
throw new ArgumentException (Locale.GetText ("Wrong type."), "encodedData");
throw new ArgumentException (Locale.GetText ("Wrong type."), "asnEncodedData");
if (ex._oid == null)
_oid = new Oid (oid, friendlyName);

10
mcs/class/System/System.Security.Cryptography.X509Certificates/X509SubjectKeyIdentifierExtension.cs
View File

@@ -159,14 +159,14 @@ namespace System.Security.Cryptography.X509Certificates {
// methods
public override void CopyFrom (AsnEncodedData encodedData)
public override void CopyFrom (AsnEncodedData asnEncodedData)
{
if (encodedData == null)
throw new ArgumentNullException ("encodedData");
if (asnEncodedData == null)
throw new ArgumentNullException ("asnEncodedData");
X509Extension ex = (encodedData as X509Extension);
X509Extension ex = (asnEncodedData as X509Extension);
if (ex == null)
throw new ArgumentException (Locale.GetText ("Wrong type."), "encodedData");
throw new ArgumentException (Locale.GetText ("Wrong type."), "asnEncodedData");
if (ex._oid == null)
_oid = new Oid (oid, friendlyName);