lucidiot
/
kaitai_struct_csharp_runtime
1
0
Fork 0
Code Issues Pull Requests Releases Activity

cleanup

This commit is contained in:
Arkadiusz Bulski 2018-01-22 19:55:20 +01:00
parent c610cfa0dd
commit eed912a781
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
KaitaiStream.cs
View File

@ -16,7 +16,6 @@ namespace Kaitai
public KaitaiStream(Stream stream) : base(stream) public KaitaiStream(Stream stream) : base(stream)
{ {
} }
///<summary> ///<summary>
@ -24,7 +23,6 @@ namespace Kaitai
///</summary> ///</summary>
public KaitaiStream(string file) : base(File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read)) public KaitaiStream(string file) : base(File.Open(file, FileMode.Open, FileAccess.Read, FileShare.Read))
{ {
} }
///<summary> ///<summary>
@ -32,7 +30,6 @@ namespace Kaitai
///</summary> ///</summary>
public KaitaiStream(byte[] bytes) : base(new MemoryStream(bytes)) public KaitaiStream(byte[] bytes) : base(new MemoryStream(bytes))
{ {
} }
private ulong Bits = 0; private ulong Bits = 0;
@ -68,7 +65,7 @@ namespace Kaitai
} }
/// <summary> /// <summary>
/// Get the total length of the stream /// Get the total length of the stream (ie. file size)
/// </summary> /// </summary>
public long Size public long Size
{ {
@ -322,14 +319,7 @@ namespace Kaitai
private static ulong GetMaskOnes(int n) private static ulong GetMaskOnes(int n)
{ {
if (n == 64) return n == 64 ? 0xffffffffffffffffUL : (1UL << n) - 1;
{
return 0xffffffffffffffffUL;
}
else
{
return (1UL << n) - 1;
}
} }
#endregion #endregion
@ -360,9 +350,8 @@ namespace Kaitai
{ {
if (count > Int32.MaxValue) if (count > Int32.MaxValue)
throw new ArgumentOutOfRangeException("requested " + count + " bytes, while only non-negative int32 amount of bytes possible"); throw new ArgumentOutOfRangeException("requested " + count + " bytes, while only non-negative int32 amount of bytes possible");
int cnt = (int)count; byte[] bytes = base.ReadBytes((int)count);
byte[] bytes = base.ReadBytes(cnt); if (bytes.Length < (int)count)
if (bytes.Length < cnt)
throw new EndOfStreamException("requested " + count + " bytes, but got only " + bytes.Length + " bytes"); throw new EndOfStreamException("requested " + count + " bytes, but got only " + bytes.Length + " bytes");
return bytes; return bytes;
} }
@ -410,7 +399,7 @@ namespace Kaitai
/// <returns></returns> /// <returns></returns>
public byte[] ReadBytesTerm(byte terminator, bool includeTerminator, bool consumeTerminator, bool eosError) public byte[] ReadBytesTerm(byte terminator, bool includeTerminator, bool consumeTerminator, bool eosError)
{ {
List<byte> bytes = new System.Collections.Generic.List<byte>(); List<byte> bytes = new List<byte>();
while (true) while (true)
{ {
if (IsEof) if (IsEof)