Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed Sun CC warning about local variable read hiding wxStreamBuffer::read

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-09-13 14:34:38 +00:00
parent 8d79ccefda
commit 15dc68b6b8
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/stream.cpp
View File

@@ -376,14 +376,14 @@ size_t wxStreamBuffer::Read(void *buffer, size_t size)
if ( m_stream ) if ( m_stream )
m_stream->Reset(); m_stream->Reset();
size_t read; size_t readBytes;
if ( !HasBuffer() ) if ( !HasBuffer() )
{ {
wxInputStream *inStream = GetInputStream(); wxInputStream *inStream = GetInputStream();
wxCHECK_MSG( inStream, 0, _T("should have a stream in wxStreamBuffer") ); wxCHECK_MSG( inStream, 0, _T("should have a stream in wxStreamBuffer") );
read = inStream->OnSysRead(buffer, size); readBytes = inStream->OnSysRead(buffer, size);
} }
else // we have a buffer, use it else // we have a buffer, use it
{ {
@@ -414,13 +414,13 @@ size_t wxStreamBuffer::Read(void *buffer, size_t size)
} }
} }
read = orig_size - size; readBytes = orig_size - size;
} }
if ( m_stream ) if ( m_stream )
m_stream->m_lastcount = read; m_stream->m_lastcount = readBytes;
return read; return readBytes;
} }
// this should really be called "Copy()" // this should really be called "Copy()"
@@ -1279,5 +1279,4 @@ wxOutputStream& wxEndL(wxOutputStream& stream)
return stream.Write(eol, wxStrlen(eol)); return stream.Write(eol, wxStrlen(eol));
} }
#endif #endif // wxUSE_STREAMS
// wxUSE_STREAMS