From 64491fdce5cd827e3198c1e0022d77f0366f7e2d Mon Sep 17 00:00:00 2001 From: joncham Date: Tue, 15 Jun 2010 22:48:09 +0000 Subject: [PATCH] 2010-06-15 Jonathan Chambers * Tds.cs: Add {} around default switch case. * OdbcDataReader.cs: Remove unneeded cast on ref parameter git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/mcs@158984 e3ebcda4-bce8-0310-ba0a-eca2169e7518 --- class/Mono.Data.Tds/Mono.Data.Tds.Protocol/ChangeLog | 4 ++++ class/Mono.Data.Tds/Mono.Data.Tds.Protocol/Tds.cs | 3 ++- class/System.Data/System.Data.Odbc/ChangeLog | 4 ++++ class/System.Data/System.Data.Odbc/OdbcDataReader.cs | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/ChangeLog b/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/ChangeLog index 515368df0a..04e6919fec 100644 --- a/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/ChangeLog +++ b/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/ChangeLog @@ -1,3 +1,7 @@ +2010-06-15 Jonathan Chambers + + * Tds.cs: Add {} around default switch case. + 2010-06-15 Veerapuram Varadhan ** Fixes #613087 diff --git a/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/Tds.cs b/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/Tds.cs index 9da5e9271f..76a810ab80 100644 --- a/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/Tds.cs +++ b/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/Tds.cs @@ -1232,7 +1232,7 @@ namespace Mono.Data.Tds.Protocol val = ~(val - 1); return new Decimal (val, 0, 0, negative, 4); } - case 8: + case 8: { int hi = Comm.GetTdsInt (); int lo = Comm.GetTdsInt (); bool negative = hi < 0; @@ -1242,6 +1242,7 @@ namespace Mono.Data.Tds.Protocol lo = ~(lo - 1); } return new Decimal (lo, hi, 0, negative, 4); + } default: return DBNull.Value; } diff --git a/class/System.Data/System.Data.Odbc/ChangeLog b/class/System.Data/System.Data.Odbc/ChangeLog index c7079df77d..329779274a 100644 --- a/class/System.Data/System.Data.Odbc/ChangeLog +++ b/class/System.Data/System.Data.Odbc/ChangeLog @@ -1,3 +1,7 @@ +2010-06-15 Jonathan Chambers + + * OdbcDataReader.cs: Remove unneeded cast on ref parameter + 2009-07-15 Veerapuram Varadhan * OdbcParameter.cs (OdbcType): Return appropriate type from the typeMap. diff --git a/class/System.Data/System.Data.Odbc/OdbcDataReader.cs b/class/System.Data/System.Data.Odbc/OdbcDataReader.cs index bf24869f83..0541d2be0b 100644 --- a/class/System.Data/System.Data.Odbc/OdbcDataReader.cs +++ b/class/System.Data/System.Data.Odbc/OdbcDataReader.cs @@ -1100,7 +1100,7 @@ namespace System.Data.Odbc // NON_UNIQUE int nonUniqueLength = 0; short nonUnique = libodbc.SQL_FALSE; - ret = libodbc.SQLBindCol (handle, 4, SQL_C_TYPE.SHORT, ref (short) nonUnique, sizeof (short), ref nonUniqueLength); + ret = libodbc.SQLBindCol (handle, 4, SQL_C_TYPE.SHORT, ref nonUnique, sizeof (short), ref nonUniqueLength); if (ret != OdbcReturn.Success && ret != OdbcReturn.SuccessWithInfo) throw Connection.CreateOdbcException (OdbcHandleType.Stmt, handle); -- 2.11.4.GIT