Permalink
Browse files

Fix a few cases of mixed line-endings

This is a scripted conversion of mixed line-ending files to LF-only or CRLF-only
based on which patch is smaller.  I used a threshold of upto a quarter of the
lines to determine whether to keep the patch or not.
  • Loading branch information...
harinath committed Jul 25, 2010
1 parent 5c94b81 commit cd51491631380ed56723fdfc66945213f9864b5a
Showing 373 changed files with 4,347 additions and 4,501 deletions.
View
@@ -1,3 +1,2 @@
/BCC_MAKEFILE -crlf
/digimars.mak -crlf
-/win32_threads.c -crlf
@@ -1 +0,0 @@
-/gcconfig.h -crlf
@@ -408,18 +408,18 @@
# else
# if (defined(_MSDOS) || defined(_MSC_VER)) && (_M_IX86 >= 300) \
|| defined(_WIN32) && !defined(__CYGWIN32__) && !defined(__CYGWIN__)
-# if defined(__LP64__) || defined(_WIN64)
-# define X86_64
-# else
-# define I386
-# endif
-# define MSWIN32 /* or Win64 */
-# define mach_type_known
-# endif
-# if defined(_MSC_VER) && defined(_M_IA64)
-# define IA64
-# define MSWIN32 /* Really win64, but we don't treat 64-bit */
- /* variants as a differnt platform. */
+# if defined(__LP64__) || defined(_WIN64)
+# define X86_64
+# else
+# define I386
+# endif
+# define MSWIN32 /* or Win64 */
+# define mach_type_known
+# endif
+# if defined(_MSC_VER) && defined(_M_IA64)
+# define IA64
+# define MSWIN32 /* Really win64, but we don't treat 64-bit */
+ /* variants as a differnt platform. */
# endif
# endif
# if defined(__DJGPP__)
@@ -808,7 +808,7 @@
# define STACKBOTTOM ((ptr_t) LMGetCurStackBase())
# define DATAEND /* not needed */
# endif
-
+
# ifdef LINUX
# if defined(__powerpc64__)
# define ALIGNMENT 8
View
@@ -385,10 +385,10 @@ void GC_push_all_stacks()
# define PUSH4(r1,r2,r3,r4) PUSH2(r1,r2), PUSH2(r3,r4)
# if defined(I386)
PUSH4(Edi,Esi,Ebx,Edx), PUSH2(Ecx,Eax), PUSH1(Ebp);
- sp = (ptr_t)context.Esp;
-# elif defined(X86_64)
- PUSH4(Rax,Rcx,Rdx,Rbx); PUSH2(Rbp, Rsi); PUSH1(Rdi);
- PUSH4(R8, R9, R10, R11); PUSH4(R12, R13, R14, R15);
+ sp = (ptr_t)context.Esp;
+# elif defined(X86_64)
+ PUSH4(Rax,Rcx,Rdx,Rbx); PUSH2(Rbp, Rsi); PUSH1(Rdi);
+ PUSH4(R8, R9, R10, R11); PUSH4(R12, R13, R14, R15);
sp = (ptr_t)context.Rsp;
# elif defined(ARM32)
PUSH4(R0,R1,R2,R3),PUSH4(R4,R5,R6,R7),PUSH4(R8,R9,R10,R11),PUSH1(R12);
@@ -1,3 +1,2 @@
-/RncParser.jay -crlf
/RncTokenizer.cs -crlf
/RncWriter.cs -crlf
@@ -118,9 +118,9 @@ namespace Commons.Xml.Relaxng.Rnc
if (p is RelaxngGrammar)
((RelaxngGrammar) p).IsSourceCompactSyntax = true;
return p;
- } catch (Exception ex) {
- throw new RelaxngException (String.Format ("Tokenizer error at line {0}, column {1}: {2}", Line, Column, ex.Message), ex);
- }
+ } catch (Exception ex) {
+ throw new RelaxngException (String.Format ("Tokenizer error at line {0}, column {1}: {2}", Line, Column, ex.Message), ex);
+ }
}
private void FillLocation (RelaxngElementBase el)
@@ -7,27 +7,27 @@
// (C)2003 Atsushi Enomoto
// (C)2004 Novell Inc.
//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
using System;
using System.Collections;
@@ -508,4 +508,4 @@ private int ParseToken (bool backslashed)
}
}
-}
+}
@@ -6,27 +6,27 @@
//
// (C)2005 Novell Inc.
//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
using System;
using System.Collections;
@@ -554,4 +554,4 @@ public void WriteNameExcept (RelaxngExceptNameClass e)
}
#endregion
}
-}
+}
@@ -8,26 +8,26 @@
//
// Copyright (c) 2004 Novell Inc.
// All rights reserved
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
//
// Similar to SAX DefaultHandler
@@ -47,12 +47,12 @@
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
-#if NET_2_0
+#if NET_2_0
[assembly: AssemblyVersion("2.6.0.0")]
-#else
-// not worrying about the NET_1_0 profile for now.
+#else
+// not worrying about the NET_1_0 profile for now.
[assembly: AssemblyVersion("0.6.0.0")]
-#endif
+#endif
[assembly: AssemblyDelaySign(true)]
[assembly: AssemblyKeyFile ("SharpZipLib.pub")]
@@ -1 +0,0 @@
-/ByteEncoding.cs -crlf
@@ -371,21 +371,21 @@ public unsafe override String GetString(byte[] bytes, int index, int count)
("count", Strings.GetString("ArgRange_Array"));
}
- if (count == 0)
- return string.Empty;
-
- string s = new string ((char) 0, count);
-
- fixed (byte* bytePtr = bytes)
- fixed (char* charPtr = s)
- fixed (char* cvt = toChars) {
- byte* b = bytePtr + index;
- char* c = charPtr;
+ if (count == 0)
+ return string.Empty;
+
+ string s = new string ((char) 0, count);
+
+ fixed (byte* bytePtr = bytes)
+ fixed (char* charPtr = s)
+ fixed (char* cvt = toChars) {
+ byte* b = bytePtr + index;
+ char* c = charPtr;
while(count-- != 0)
*(c++) = cvt[*(b++)];
}
-
- return s;
+
+ return s;
}
public override String GetString(byte[] bytes)
{
@@ -1,6 +1,5 @@
/DB2ClientUtils.cs -crlf
/DB2Command.cs -crlf
-/DB2CommandBuilder.cs -crlf
/DB2Connection.cs -crlf
/DB2ConnectionPool.cs -crlf
/DB2ConnectionSettings.cs -crlf
@@ -46,7 +46,7 @@ public DB2CommandBuilder (DB2DataAdapter adapter)
DataAdapter = adapter;
}
- public DB2DataAdapter DataAdapter
+ public DB2DataAdapter DataAdapter
{
get
{
@@ -77,7 +77,7 @@ public DB2DataAdapter DataAdapter
}
}
- public string QuotePrefix
+ public string QuotePrefix
{
get
{
@@ -87,7 +87,7 @@ public string QuotePrefix
{ }
}
- public string QuoteSuffix
+ public string QuoteSuffix
{
get
{
@@ -119,7 +119,7 @@ public DB2Command GetInsertCommand ()
values += ", ";
}
- if(!((bool)dr["IsAutoIncrement"]))
+ if(!((bool)dr["IsAutoIncrement"]))
{
fields += column.ColumnName;
//values += ":v_" + column.ColumnName;
@@ -135,8 +135,8 @@ public DB2Command GetInsertCommand ()
{
//DataColumn column = dt.Columns[i];
DataRow dr = dt.Rows[i];
- DataColumn column = new DataColumn((string)dr["ColumnName"], DB2TypeConverter.GetManagedType((int)dr["ProviderType"]));
- if (!((bool)dr["IsAutoIncrement"]))
+ DataColumn column = new DataColumn((string)dr["ColumnName"], DB2TypeConverter.GetManagedType((int)dr["ProviderType"]));
+ if (!((bool)dr["IsAutoIncrement"]))
{
DB2Parameter aux = new DB2Parameter("v_" + column.ColumnName, column.DataType);
aux.Direction = ParameterDirection.Input;
@@ -158,7 +158,7 @@ public DB2Command GetUpdateCommand ()
string wheres = "";
for (int i = 0; i < dt.Rows.Count; i++)
{
- if (sets.Length != 0 && !((bool)dt.Rows[i]["IsAutoIncrement"]))
+ if (sets.Length != 0 && !((bool)dt.Rows[i]["IsAutoIncrement"]))
{
sets += ", ";
}
@@ -180,7 +180,7 @@ public DB2Command GetUpdateCommand ()
{
DataRow dr = dt.Rows[i];
DataColumn column = new DataColumn((string)dr["ColumnName"], DB2TypeConverter.GetManagedType((int)dr["ProviderType"]));
- if (!((bool)dr["IsAutoIncrement"]))
+ if (!((bool)dr["IsAutoIncrement"]))
{
DB2Parameter aux = new DB2Parameter("s_" + column.ColumnName, column.DataType);
aux.Direction = ParameterDirection.Input;
@@ -251,7 +251,7 @@ public void RefreshSchema ()
deleteCommand = null;
}
- private DataTable GetSchema()
+ private DataTable GetSchema()
{
dataAdapter.SelectCommand.Connection.Open();
DB2Command cmd = new DB2Command(dataAdapter.SelectCommand.CommandText, dataAdapter.SelectCommand.Connection);
Oops, something went wrong.

0 comments on commit cd51491

Please sign in to comment.