X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03647350fc7cd141953c72e0284e928847d30f44..cb41a69b152026d6c586d21148e34913291cd733:/src/common/fileback.cpp diff --git a/src/common/fileback.cpp b/src/common/fileback.cpp index 5544ee7b54..c9c6c49476 100644 --- a/src/common/fileback.cpp +++ b/src/common/fileback.cpp @@ -2,7 +2,6 @@ // Name: src/common/fileback.cpp // Purpose: Back an input stream with memory or a file // Author: Mike Wetherell -// RCS-ID: $Id$ // Copyright: (c) 2006 Mike Wetherell // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -168,11 +167,9 @@ wxStreamError wxBackingFileImpl::ReadAt(wxFileOffset pos, m_filelen += count; if (count < m_buflen) { - delete m_stream; - m_stream = NULL; + wxDELETE(m_stream); if (count > 0) { - delete[] m_buf; - m_buf = NULL; + wxDELETEA(m_buf); m_buflen = 0; } m_parenterror = wxSTREAM_READ_ERROR; @@ -182,8 +179,7 @@ wxStreamError wxBackingFileImpl::ReadAt(wxFileOffset pos, m_buflen = 0; if (!m_stream) { - delete[] m_buf; - m_buf = NULL; + wxDELETEA(m_buf); } } @@ -197,8 +193,7 @@ wxStreamError wxBackingFileImpl::ReadAt(wxFileOffset pos, m_parenterror = m_stream->GetLastError(); if (m_parenterror == wxSTREAM_NO_ERROR) m_parenterror = wxSTREAM_EOF; - delete m_stream; - m_stream = NULL; + wxDELETE(m_stream); } }