[Dotgnu-pnet-commits] CVS: pnetlib/runtime/System/IO BufferedStream.cs,1.2,1.3

[Gopal.V <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/runtime/System/IO
In directory subversions:/tmp/cvs-serv17293/runtime/System/IO

Modified Files:
        BufferedStream.cs 
Log Message:
Fix a number of typos and potential issues in BufferedStream


Index: BufferedStream.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/IO/BufferedStream.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** BufferedStream.cs   1 Feb 2003 22:18:19 -0000       1.2
--- BufferedStream.cs   3 Jun 2003 17:33:06 -0000       1.3
***************
*** 98,102 ****
                        else
                        {
!                               if(stream.Position == this.Position)
                                {
                                        if((outBufferLen - outBufferPosn) !=0)
--- 98,102 ----
                        else
                        {
!                               if((!CanSeek) || stream.Position == 
this.Position)
                                {
                                        if((outBufferLen - outBufferPosn) !=0)
***************
*** 117,120 ****
--- 117,121 ----
                                }
                        }
+                       stream.Flush();
                }
  
***************
*** 269,278 ****
  
                        int spaceInBuffer=bufferSize-outBufferLen;
-                       int dataLen = array.Length-offset;
                        /* simple cases first ;) */
!                       if(spaceInBuffer > dataLen)
                        {
!                               
Array.Copy(outBuffer,outBufferPosn,array,offset, dataLen);
!                               outBufferLen+=dataLen;
                                return;
                        }
--- 270,278 ----
  
                        int spaceInBuffer=bufferSize-outBufferLen;
                        /* simple cases first ;) */
!                       if(spaceInBuffer > count)
                        {
!                               Array.Copy(array, offset, 
outBuffer,outBufferLen, count);
!                               outBufferLen+=count;
                                return;
                        }
***************
*** 284,287 ****
--- 284,288 ----
                                                        
outBufferLen-outBufferPosn);
                                outBufferLen -= outBufferPosn;  
+                               outBufferPosn = 0;
                        }
                        else
***************
*** 289,299 ****
                                /* empty buffer */
                                outBufferLen=0;
                        }
                        spaceInBuffer=bufferSize-outBufferLen;
!                       if(spaceInBuffer > dataLen)
                        {
!                               Array.Copy(outBuffer, outBufferPosn, outBuffer, 
0, 
!                                                       
outBufferLen-outBufferPosn);
!                               outBufferLen+=dataLen;
                                return;
                        }
--- 290,300 ----
                                /* empty buffer */
                                outBufferLen=0;
+                               outBufferPosn=0;
                        }
                        spaceInBuffer=bufferSize-outBufferLen;
!                       if(spaceInBuffer > count)
                        {
!                               Array.Copy(array, offset, outBuffer, 
outBufferLen, count);
!                               outBufferLen+=count;
                                return;
                        }
***************
*** 306,311 ****
                        {
                                stream.Write(array,offset,count-keptData);
!                               Array.Copy(outBuffer, outBufferPosn, array, 
!                                                       offset + count - 
keptData, keptData);
                                outBufferLen+=keptData;
                        }
--- 307,312 ----
                        {
                                stream.Write(array,offset,count-keptData);
!                               Array.Copy(array, offset + count - keptData, 
!                                                       outBuffer, 
outBufferPosn, keptData);
                                outBufferLen+=keptData;
                        }