Fixed a bunch of inconsistent/wrong line endings in the C# part, no other changes
diff --git a/lib/csharp/src/Protocol/TBinaryProtocol.cs b/lib/csharp/src/Protocol/TBinaryProtocol.cs
index 4bbd9ad..2e86a70 100644
--- a/lib/csharp/src/Protocol/TBinaryProtocol.cs
+++ b/lib/csharp/src/Protocol/TBinaryProtocol.cs
@@ -337,14 +337,14 @@
{
ReadAll(i32in, 0, 4);
return (int)(((i32in[0] & 0xff) << 24) | ((i32in[1] & 0xff) << 16) | ((i32in[2] & 0xff) << 8) | ((i32in[3] & 0xff)));
- }
-
-#pragma warning disable 675
-
+ }
+
+#pragma warning disable 675
+
private byte[] i64in = new byte[8];
public override long ReadI64()
{
- ReadAll(i64in, 0, 8);
+ ReadAll(i64in, 0, 8);
unchecked {
return (long)(
((long)(i64in[0] & 0xff) << 56) |
@@ -356,10 +356,10 @@
((long)(i64in[6] & 0xff) << 8) |
((long)(i64in[7] & 0xff)));
}
- }
-
-#pragma warning restore 675
-
+ }
+
+#pragma warning restore 675
+
public override double ReadDouble()
{
#if !SILVERLIGHT
diff --git a/lib/csharp/src/Protocol/TCompactProtocol.cs b/lib/csharp/src/Protocol/TCompactProtocol.cs
index a498577..2c94c0c 100644
--- a/lib/csharp/src/Protocol/TCompactProtocol.cs
+++ b/lib/csharp/src/Protocol/TCompactProtocol.cs
@@ -478,12 +478,12 @@
* Read a message header.
*/
public override TMessage ReadMessageBegin()
- {
+ {
byte protocolId = (byte)ReadByte();
if (protocolId != PROTOCOL_ID)
{
throw new TProtocolException("Expected protocol id " + PROTOCOL_ID.ToString("X") + " but got " + protocolId.ToString("X"));
- }
+ }
byte versionAndType = (byte)ReadByte();
byte version = (byte)(versionAndType & VERSION_MASK);
if (version != VERSION)
@@ -521,7 +521,7 @@
* Read a field header off the wire.
*/
public override TField ReadFieldBegin()
- {
+ {
byte type = (byte)ReadByte();
// if it's a stop, then we can return immediately, as the struct is over.
@@ -566,7 +566,7 @@
*/
public override TMap ReadMapBegin()
{
- int size = (int)ReadVarint32();
+ int size = (int)ReadVarint32();
byte keyAndValueType = size == 0 ? (byte)0 : (byte)ReadByte();
return new TMap(getTType((byte)(keyAndValueType >> 4)), getTType((byte)(keyAndValueType & 0xf)), size);
}
@@ -578,7 +578,7 @@
* true size.
*/
public override TList ReadListBegin()
- {
+ {
byte size_and_type = (byte)ReadByte();
int size = (size_and_type >> 4) & 0x0f;
if (size == 15)
@@ -723,7 +723,7 @@
uint result = 0;
int shift = 0;
while (true)
- {
+ {
byte b = (byte)ReadByte();
result |= (uint)(b & 0x7f) << shift;
if ((b & 0x80) != 0x80) break;
@@ -741,7 +741,7 @@
int shift = 0;
ulong result = 0;
while (true)
- {
+ {
byte b = (byte)ReadByte();
result |= (ulong)(b & 0x7f) << shift;
if ((b & 0x80) != 0x80) break;
diff --git a/lib/csharp/src/Protocol/TProtocolDecorator.cs b/lib/csharp/src/Protocol/TProtocolDecorator.cs
index e1977f5..218a5c1 100644
--- a/lib/csharp/src/Protocol/TProtocolDecorator.cs
+++ b/lib/csharp/src/Protocol/TProtocolDecorator.cs
@@ -1,262 +1,262 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * Contains some contributions under the Thrift Software License.
- * Please see doc/old-thrift-license.txt in the Thrift distribution for
- * details.
- */
-
-using System;
-using System.Text;
-using Thrift.Transport;
-using System.Collections.Generic;
-
-namespace Thrift.Protocol
-{
-
- /**
- * TProtocolDecorator forwards all requests to an enclosed TProtocol instance,
- * providing a way to author concise concrete decorator subclasses. While it has
- * no abstract methods, it is marked abstract as a reminder that by itself,
- * it does not modify the behaviour of the enclosed TProtocol.
- *
- * See p.175 of Design Patterns (by Gamma et al.)
- * See TMultiplexedProtocol
- */
- public abstract class TProtocolDecorator : TProtocol
- {
- private TProtocol WrappedProtocol;
-
- /**
- * Encloses the specified protocol.
- * @param protocol All operations will be forward to this protocol. Must be non-null.
- */
- public TProtocolDecorator(TProtocol protocol)
- : base( protocol.Transport)
- {
-
- WrappedProtocol = protocol;
- }
-
- public override void WriteMessageBegin(TMessage tMessage)
- {
- WrappedProtocol.WriteMessageBegin(tMessage);
- }
-
- public override void WriteMessageEnd()
- {
- WrappedProtocol.WriteMessageEnd();
- }
-
- public override void WriteStructBegin(TStruct tStruct)
- {
- WrappedProtocol.WriteStructBegin(tStruct);
- }
-
- public override void WriteStructEnd()
- {
- WrappedProtocol.WriteStructEnd();
- }
-
- public override void WriteFieldBegin(TField tField)
- {
- WrappedProtocol.WriteFieldBegin(tField);
- }
-
- public override void WriteFieldEnd()
- {
- WrappedProtocol.WriteFieldEnd();
- }
-
- public override void WriteFieldStop()
- {
- WrappedProtocol.WriteFieldStop();
- }
-
- public override void WriteMapBegin(TMap tMap)
- {
- WrappedProtocol.WriteMapBegin(tMap);
- }
-
- public override void WriteMapEnd()
- {
- WrappedProtocol.WriteMapEnd();
- }
-
- public override void WriteListBegin(TList tList)
- {
- WrappedProtocol.WriteListBegin(tList);
- }
-
- public override void WriteListEnd()
-{
- WrappedProtocol.WriteListEnd();
- }
-
- public override void WriteSetBegin(TSet tSet)
- {
- WrappedProtocol.WriteSetBegin(tSet);
- }
-
- public override void WriteSetEnd()
- {
- WrappedProtocol.WriteSetEnd();
- }
-
- public override void WriteBool(bool b)
- {
- WrappedProtocol.WriteBool(b);
- }
-
- public override void WriteByte(sbyte b)
- {
- WrappedProtocol.WriteByte(b);
- }
-
- public override void WriteI16(short i)
- {
- WrappedProtocol.WriteI16(i);
- }
-
- public override void WriteI32(int i)
- {
- WrappedProtocol.WriteI32(i);
- }
-
- public override void WriteI64(long l)
- {
- WrappedProtocol.WriteI64(l);
- }
-
- public override void WriteDouble(double v)
- {
- WrappedProtocol.WriteDouble(v);
- }
-
- public override void WriteString(String s)
- {
- WrappedProtocol.WriteString(s);
- }
-
- public override void WriteBinary(byte[] bytes)
- {
- WrappedProtocol.WriteBinary(bytes);
- }
-
- public override TMessage ReadMessageBegin()
- {
- return WrappedProtocol.ReadMessageBegin();
- }
-
- public override void ReadMessageEnd()
- {
- WrappedProtocol.ReadMessageEnd();
- }
-
- public override TStruct ReadStructBegin()
- {
- return WrappedProtocol.ReadStructBegin();
- }
-
- public override void ReadStructEnd()
- {
- WrappedProtocol.ReadStructEnd();
- }
-
- public override TField ReadFieldBegin()
- {
- return WrappedProtocol.ReadFieldBegin();
- }
-
- public override void ReadFieldEnd()
- {
- WrappedProtocol.ReadFieldEnd();
- }
-
- public override TMap ReadMapBegin()
- {
- return WrappedProtocol.ReadMapBegin();
- }
-
- public override void ReadMapEnd()
- {
- WrappedProtocol.ReadMapEnd();
- }
-
- public override TList ReadListBegin()
- {
- return WrappedProtocol.ReadListBegin();
- }
-
- public override void ReadListEnd()
- {
- WrappedProtocol.ReadListEnd();
- }
-
- public override TSet ReadSetBegin()
- {
- return WrappedProtocol.ReadSetBegin();
- }
-
- public override void ReadSetEnd()
- {
- WrappedProtocol.ReadSetEnd();
- }
-
- public override bool ReadBool()
- {
- return WrappedProtocol.ReadBool();
- }
-
- public override sbyte ReadByte()
- {
- return WrappedProtocol.ReadByte();
- }
-
- public override short ReadI16()
- {
- return WrappedProtocol.ReadI16();
- }
-
- public override int ReadI32()
- {
- return WrappedProtocol.ReadI32();
- }
-
- public override long ReadI64()
- {
- return WrappedProtocol.ReadI64();
- }
-
- public override double ReadDouble()
- {
- return WrappedProtocol.ReadDouble();
- }
-
- public override String ReadString()
- {
- return WrappedProtocol.ReadString();
- }
-
- public override byte[] ReadBinary()
- {
- return WrappedProtocol.ReadBinary();
- }
- }
-
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * Contains some contributions under the Thrift Software License.
+ * Please see doc/old-thrift-license.txt in the Thrift distribution for
+ * details.
+ */
+
+using System;
+using System.Text;
+using Thrift.Transport;
+using System.Collections.Generic;
+
+namespace Thrift.Protocol
+{
+
+ /**
+ * TProtocolDecorator forwards all requests to an enclosed TProtocol instance,
+ * providing a way to author concise concrete decorator subclasses. While it has
+ * no abstract methods, it is marked abstract as a reminder that by itself,
+ * it does not modify the behaviour of the enclosed TProtocol.
+ *
+ * See p.175 of Design Patterns (by Gamma et al.)
+ * See TMultiplexedProtocol
+ */
+ public abstract class TProtocolDecorator : TProtocol
+ {
+ private TProtocol WrappedProtocol;
+
+ /**
+ * Encloses the specified protocol.
+ * @param protocol All operations will be forward to this protocol. Must be non-null.
+ */
+ public TProtocolDecorator(TProtocol protocol)
+ : base( protocol.Transport)
+ {
+
+ WrappedProtocol = protocol;
+ }
+
+ public override void WriteMessageBegin(TMessage tMessage)
+ {
+ WrappedProtocol.WriteMessageBegin(tMessage);
+ }
+
+ public override void WriteMessageEnd()
+ {
+ WrappedProtocol.WriteMessageEnd();
+ }
+
+ public override void WriteStructBegin(TStruct tStruct)
+ {
+ WrappedProtocol.WriteStructBegin(tStruct);
+ }
+
+ public override void WriteStructEnd()
+ {
+ WrappedProtocol.WriteStructEnd();
+ }
+
+ public override void WriteFieldBegin(TField tField)
+ {
+ WrappedProtocol.WriteFieldBegin(tField);
+ }
+
+ public override void WriteFieldEnd()
+ {
+ WrappedProtocol.WriteFieldEnd();
+ }
+
+ public override void WriteFieldStop()
+ {
+ WrappedProtocol.WriteFieldStop();
+ }
+
+ public override void WriteMapBegin(TMap tMap)
+ {
+ WrappedProtocol.WriteMapBegin(tMap);
+ }
+
+ public override void WriteMapEnd()
+ {
+ WrappedProtocol.WriteMapEnd();
+ }
+
+ public override void WriteListBegin(TList tList)
+ {
+ WrappedProtocol.WriteListBegin(tList);
+ }
+
+ public override void WriteListEnd()
+{
+ WrappedProtocol.WriteListEnd();
+ }
+
+ public override void WriteSetBegin(TSet tSet)
+ {
+ WrappedProtocol.WriteSetBegin(tSet);
+ }
+
+ public override void WriteSetEnd()
+ {
+ WrappedProtocol.WriteSetEnd();
+ }
+
+ public override void WriteBool(bool b)
+ {
+ WrappedProtocol.WriteBool(b);
+ }
+
+ public override void WriteByte(sbyte b)
+ {
+ WrappedProtocol.WriteByte(b);
+ }
+
+ public override void WriteI16(short i)
+ {
+ WrappedProtocol.WriteI16(i);
+ }
+
+ public override void WriteI32(int i)
+ {
+ WrappedProtocol.WriteI32(i);
+ }
+
+ public override void WriteI64(long l)
+ {
+ WrappedProtocol.WriteI64(l);
+ }
+
+ public override void WriteDouble(double v)
+ {
+ WrappedProtocol.WriteDouble(v);
+ }
+
+ public override void WriteString(String s)
+ {
+ WrappedProtocol.WriteString(s);
+ }
+
+ public override void WriteBinary(byte[] bytes)
+ {
+ WrappedProtocol.WriteBinary(bytes);
+ }
+
+ public override TMessage ReadMessageBegin()
+ {
+ return WrappedProtocol.ReadMessageBegin();
+ }
+
+ public override void ReadMessageEnd()
+ {
+ WrappedProtocol.ReadMessageEnd();
+ }
+
+ public override TStruct ReadStructBegin()
+ {
+ return WrappedProtocol.ReadStructBegin();
+ }
+
+ public override void ReadStructEnd()
+ {
+ WrappedProtocol.ReadStructEnd();
+ }
+
+ public override TField ReadFieldBegin()
+ {
+ return WrappedProtocol.ReadFieldBegin();
+ }
+
+ public override void ReadFieldEnd()
+ {
+ WrappedProtocol.ReadFieldEnd();
+ }
+
+ public override TMap ReadMapBegin()
+ {
+ return WrappedProtocol.ReadMapBegin();
+ }
+
+ public override void ReadMapEnd()
+ {
+ WrappedProtocol.ReadMapEnd();
+ }
+
+ public override TList ReadListBegin()
+ {
+ return WrappedProtocol.ReadListBegin();
+ }
+
+ public override void ReadListEnd()
+ {
+ WrappedProtocol.ReadListEnd();
+ }
+
+ public override TSet ReadSetBegin()
+ {
+ return WrappedProtocol.ReadSetBegin();
+ }
+
+ public override void ReadSetEnd()
+ {
+ WrappedProtocol.ReadSetEnd();
+ }
+
+ public override bool ReadBool()
+ {
+ return WrappedProtocol.ReadBool();
+ }
+
+ public override sbyte ReadByte()
+ {
+ return WrappedProtocol.ReadByte();
+ }
+
+ public override short ReadI16()
+ {
+ return WrappedProtocol.ReadI16();
+ }
+
+ public override int ReadI32()
+ {
+ return WrappedProtocol.ReadI32();
+ }
+
+ public override long ReadI64()
+ {
+ return WrappedProtocol.ReadI64();
+ }
+
+ public override double ReadDouble()
+ {
+ return WrappedProtocol.ReadDouble();
+ }
+
+ public override String ReadString()
+ {
+ return WrappedProtocol.ReadString();
+ }
+
+ public override byte[] ReadBinary()
+ {
+ return WrappedProtocol.ReadBinary();
+ }
+ }
+
+}