// doing this has big chances to lead to a crash when the source buffer is
// destroyed (otherwise assume the caller knows what he does)
wxASSERT_MSG( !buffer.m_destroybuf,
- _T("it's a bad idea to copy this buffer") );
+ wxT("it's a bad idea to copy this buffer") );
m_buffer_start = buffer.m_buffer_start;
m_buffer_end = buffer.m_buffer_end;
}
char *new_start = (char *)realloc(m_buffer_start, new_size);
- wxCHECK_RET( new_size, _T("shrinking buffer shouldn't fail") );
+ wxCHECK_RET( new_size, wxT("shrinking buffer shouldn't fail") );
m_buffer_start = new_start;
m_buffer_end = m_buffer_start + new_size;
// write the buffer contents to the stream (only for write buffers)
bool wxStreamBuffer::FlushBuffer()
{
- wxCHECK_MSG( m_flushable, false, _T("can't flush this buffer") );
+ wxCHECK_MSG( m_flushable, false, wxT("can't flush this buffer") );
// FIXME: what is this check for? (VZ)
if ( m_buffer_pos == m_buffer_start )
wxOutputStream *outStream = GetOutputStream();
- wxCHECK_MSG( outStream, false, _T("should have a stream in wxStreamBuffer") );
+ wxCHECK_MSG( outStream, false, wxT("should have a stream in wxStreamBuffer") );
size_t current = m_buffer_pos - m_buffer_start;
size_t count = outStream->OnSysWrite(m_buffer_start, current);
{
wxOutputStream *outStream = GetOutputStream();
- wxCHECK_RET( outStream, _T("should have a stream in wxStreamBuffer") );
+ wxCHECK_RET( outStream, wxT("should have a stream in wxStreamBuffer") );
// if we don't have buffer at all, just forward this call to the stream,
if ( !HasBuffer() )
char wxStreamBuffer::Peek()
{
wxCHECK_MSG( m_stream && HasBuffer(), 0,
- _T("should have the stream and the buffer in wxStreamBuffer") );
+ wxT("should have the stream and the buffer in wxStreamBuffer") );
if ( !GetDataLeft() )
{
{
wxInputStream *inStream = GetInputStream();
- wxCHECK_MSG( inStream, 0, _T("should have a stream in wxStreamBuffer") );
+ wxCHECK_MSG( inStream, 0, wxT("should have a stream in wxStreamBuffer") );
char c;
if ( !HasBuffer() )
size_t wxStreamBuffer::Read(void *buffer, size_t size)
{
- wxASSERT_MSG( buffer, _T("Warning: Null pointer is about to be used") );
+ wxASSERT_MSG( buffer, wxT("Warning: Null pointer is about to be used") );
/* Clear buffer first */
memset(buffer, 0x00, size);
{
wxInputStream *inStream = GetInputStream();
- wxCHECK_MSG( inStream, 0, _T("should have a stream in wxStreamBuffer") );
+ wxCHECK_MSG( inStream, 0, wxT("should have a stream in wxStreamBuffer") );
readBytes = inStream->OnSysRead(buffer, size);
}
// this should really be called "Copy()"
size_t wxStreamBuffer::Read(wxStreamBuffer *dbuf)
{
- wxCHECK_MSG( m_mode != write, 0, _T("can't read from this buffer") );
+ wxCHECK_MSG( m_mode != write, 0, wxT("can't read from this buffer") );
char buf[BUF_TEMP_SIZE];
size_t nRead,
size_t wxStreamBuffer::Write(const void *buffer, size_t size)
{
- wxASSERT_MSG( buffer, _T("Warning: Null pointer is about to be send") );
+ wxASSERT_MSG( buffer, wxT("Warning: Null pointer is about to be send") );
if (m_stream)
{
{
wxOutputStream *outStream = GetOutputStream();
- wxCHECK_MSG( outStream, 0, _T("should have a stream in wxStreamBuffer") );
+ wxCHECK_MSG( outStream, 0, wxT("should have a stream in wxStreamBuffer") );
// no buffer, just forward the call to the stream
ret = outStream->OnSysWrite(buffer, size);
size_t wxStreamBuffer::Write(wxStreamBuffer *sbuf)
{
- wxCHECK_MSG( m_mode != read, 0, _T("can't write to this buffer") );
- wxCHECK_MSG( sbuf->m_mode != write, 0, _T("can't read from that buffer") );
+ wxCHECK_MSG( m_mode != read, 0, wxT("can't write to this buffer") );
+ wxCHECK_MSG( sbuf->m_mode != write, 0, wxT("can't read from that buffer") );
char buf[BUF_TEMP_SIZE];
size_t nWrite,
break;
default:
- wxFAIL_MSG( _T("invalid seek mode") );
+ wxFAIL_MSG( wxT("invalid seek mode") );
return wxInvalidOffset;
}
size_t int_diff = wx_truncate_cast(size_t, diff);
wxCHECK_MSG( (wxFileOffset)int_diff == diff, wxInvalidOffset, wxT("huge file not supported") );
SetIntPosition(int_diff);
- return pos;
+ return diff;
}
case wxFromEnd:
return 0;
const size_t len = wx_truncate_cast(size_t, length);
- wxASSERT_MSG( len == length + size_t(0), _T("large files not supported") );
+ wxASSERT_MSG( len == length + size_t(0), wxT("large files not supported") );
return len;
}
size_t wxInputStream::GetWBack(void *buf, size_t size)
{
- wxASSERT_MSG( buf, _T("Warning: Null pointer is about to be used") );
+ wxASSERT_MSG( buf, wxT("Warning: Null pointer is about to be used") );
/* Clear buffer first */
memset(buf, 0x00, size);
size_t wxInputStream::Ungetch(const void *buf, size_t bufsize)
{
- wxASSERT_MSG( buf, _T("Warning: Null pointer is about to be used in Ungetch()") );
+ wxASSERT_MSG( buf, wxT("Warning: Null pointer is about to be used in Ungetch()") );
if ( m_lasterror != wxSTREAM_NO_ERROR && m_lasterror != wxSTREAM_EOF )
{
wxInputStream& wxInputStream::Read(void *buf, size_t size)
{
- wxASSERT_MSG( buf, _T("Warning: Null pointer is about to be read") );
+ wxASSERT_MSG( buf, wxT("Warning: Null pointer is about to be read") );
char *p = (char *)buf;
m_lastcount = 0;
{
// RR: This code is duplicated in wxBufferedInputStream. This is
// not really a good design, but buffered stream are different
- // from all other in that they handle two stream-related objects,
+ // from all others in that they handle two stream-related objects:
// the stream buffer and parent stream.
// I don't know whether it should be put as well in wxFileInputStream::OnSysSeek
if (m_lasterror==wxSTREAM_EOF)
m_lasterror=wxSTREAM_NO_ERROR;
+ // avoid unnecessary seek operations (optimization)
+ wxFileOffset currentPos = TellI(), size = GetLength();
+ if ((mode == wxFromStart && currentPos == pos) ||
+ (mode == wxFromCurrent && pos == 0) ||
+ (mode == wxFromEnd && size != wxInvalidOffset && currentPos == size-pos))
+ return currentPos;
+
+ if (!IsSeekable() && mode == wxFromCurrent && pos > 0)
+ {
+ // rather than seeking, we can just read data and discard it;
+ // this allows to forward-seek also non-seekable streams!
+ char buf[BUF_TEMP_SIZE];
+ size_t bytes_read;
+
+ // read chunks of BUF_TEMP_SIZE bytes until we reach the new position
+ for ( ; pos >= BUF_TEMP_SIZE; pos -= bytes_read)
+ {
+ bytes_read = Read(buf, WXSIZEOF(buf)).LastRead();
+ if ( m_lasterror != wxSTREAM_NO_ERROR )
+ return wxInvalidOffset;
+
+ wxASSERT(bytes_read == WXSIZEOF(buf));
+ }
+
+ // read the last 'pos' bytes
+ bytes_read = Read(buf, (size_t)pos).LastRead();
+ if ( m_lasterror != wxSTREAM_NO_ERROR )
+ return wxInvalidOffset;
+
+ wxASSERT(bytes_read == (size_t)pos);
+
+ // we should now have seeked to the right position...
+ return TellI();
+ }
+
/* RR: A call to SeekI() will automatically invalidate any previous
call to Ungetch(), otherwise it would be possible to SeekI() to
one position, unread some bytes there, SeekI() to another position
break;
default:
- wxFAIL_MSG( _T("invalid seek mode") );
+ wxFAIL_MSG( wxT("invalid seek mode") );
return wxInvalidOffset;
}
wxStreamBuffer *
CreateBufferIfNeeded(T& stream, wxStreamBuffer *buffer, size_t bufsize = 1024)
{
- return buffer ? buffer : new wxStreamBuffer(stream, bufsize);
+ return buffer ? buffer : new wxStreamBuffer(bufsize, stream);
}
} // anonymous namespace
void wxBufferedInputStream::SetInputStreamBuffer(wxStreamBuffer *buffer)
{
- wxCHECK_RET( buffer, _T("wxBufferedInputStream needs buffer") );
+ wxCHECK_RET( buffer, wxT("wxBufferedInputStream needs buffer") );
delete m_i_streambuf;
m_i_streambuf = buffer;
void wxBufferedOutputStream::SetOutputStreamBuffer(wxStreamBuffer *buffer)
{
- wxCHECK_RET( buffer, _T("wxBufferedOutputStream needs buffer") );
+ wxCHECK_RET( buffer, wxT("wxBufferedOutputStream needs buffer") );
delete m_o_streambuf;
m_o_streambuf = buffer;
projects / wxWidgets.git / blobdiff