List:Commits« Previous MessageNext Message »
From:rburnett Date:October 17 2006 11:03pm
Subject:Connector/NET commit: r409 - in branches/1.0/mysqlclient: . zlib
View as plain text  
Modified:
   branches/1.0/mysqlclient/CompressedStream.cs
   branches/1.0/mysqlclient/zlib/ZStream.cs
Log:


Modified: branches/1.0/mysqlclient/CompressedStream.cs
===================================================================
--- branches/1.0/mysqlclient/CompressedStream.cs	2006-10-17 16:04:15 UTC (rev 408)
+++ branches/1.0/mysqlclient/CompressedStream.cs	2006-10-17 21:03:47 UTC (rev 409)
@@ -126,7 +126,7 @@
                 if (zInStream != null)
                     countRead = zInStream.read(buffer, offset, countToRead);
                 else
-                    countRead =baseStream.Read(buffer, offset, countToRead);
+                    countRead = baseStream.Read(buffer, offset, countToRead);
                 offset += countRead;
                 count -= countRead;
                 inPos += countRead;
@@ -248,11 +248,13 @@
 		public override void WriteByte(byte value)
 		{
 			cache.WriteByte(value);
+			Flush();
 		}
 
 		public override void Write(byte[] buffer, int offset, int count)
 		{
             cache.Write(buffer, offset, count);
+			Flush();
 		}
 
 		public override long Seek(long offset, SeekOrigin origin)

Modified: branches/1.0/mysqlclient/zlib/ZStream.cs
===================================================================
--- branches/1.0/mysqlclient/zlib/ZStream.cs	2006-10-17 16:04:15 UTC (rev 408)
+++ branches/1.0/mysqlclient/zlib/ZStream.cs	2006-10-17 21:03:47 UTC (rev 409)
@@ -93,6 +93,7 @@
 		{
 			return inflateInit(DEF_WBITS);
 		}
+
 		public int inflateInit(int w)
 		{
 			istate = new Inflate();
@@ -105,6 +106,7 @@
 				return Z_STREAM_ERROR;
 			return istate.inflate(this, f);
 		}
+
 		public int inflateEnd()
 		{
 			if (istate == null)
@@ -113,12 +115,14 @@
 			istate = null;
 			return ret;
 		}
+
 		public int inflateSync()
 		{
 			if (istate == null)
 				return Z_STREAM_ERROR;
 			return istate.inflateSync(this);
 		}
+
 		public int inflateSetDictionary(byte[] dictionary, int dictLength)
 		{
 			if (istate == null)
@@ -130,11 +134,13 @@
 		{
 			return deflateInit(level, MAX_WBITS);
 		}
+
 		public int deflateInit(int level, int bits)
 		{
 			dstate = new Deflate();
 			return dstate.deflateInit(this, level, bits);
 		}
+
 		public int deflate(int flush)
 		{
 			if (dstate == null)
@@ -143,6 +149,7 @@
 			}
 			return dstate.deflate(this, flush);
 		}
+
 		public int deflateEnd()
 		{
 			if (dstate == null)
@@ -151,12 +158,14 @@
 			dstate = null;
 			return ret;
 		}
+
 		public int deflateParams(int level, int strategy)
 		{
 			if (dstate == null)
 				return Z_STREAM_ERROR;
 			return dstate.deflateParams(this, level, strategy);
 		}
+
 		public int deflateSetDictionary(byte[] dictionary, int dictLength)
 		{
 			if (dstate == null)

Thread
Connector/NET commit: r409 - in branches/1.0/mysqlclient: . zlibrburnett17 Oct