i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change the names of the member variables to use the OpenTracker guidelines rather than the MFC-ish m_ notation

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1165 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matthew Wilber
2002-09-25 00:56:25 +00:00
parent ba97a8bdec
commit 2ac3396c5d
1 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/translators/tgatranslator/StreamBuffer.cpp
+25 -25
View File
@@ -52,18 +52,18 @@
// --------------------------------------------------------------- // ---------------------------------------------------------------
StreamBuffer::StreamBuffer(BPositionIO *pstream, size_t nbuffersize) StreamBuffer::StreamBuffer(BPositionIO *pstream, size_t nbuffersize)
{ {
m_pStream = pstream; fpStream = pstream;
m_pBuffer = NULL; fpBuffer = NULL;
m_nBufferSize = 0; fnBufferSize = 0;
m_nLen = 0; fnLen = 0;
m_nPos = 0; fnPos = 0;
if (!pstream) if (!pstream)
return; return;
m_nBufferSize = max(nbuffersize, MIN_BUFFER_SIZE); fnBufferSize = max(nbuffersize, MIN_BUFFER_SIZE);
m_pBuffer = new uint8[m_nBufferSize]; fpBuffer = new uint8[fnBufferSize];
if (m_pBuffer) if (fpBuffer)
ReadStream(); ReadStream();
// Fill the buffer with data so that // Fill the buffer with data so that
// object is prepared for first call to // object is prepared for first call to
@@ -85,13 +85,13 @@ StreamBuffer::StreamBuffer(BPositionIO *pstream, size_t nbuffersize)
// --------------------------------------------------------------- // ---------------------------------------------------------------
StreamBuffer::~StreamBuffer() StreamBuffer::~StreamBuffer()
{ {
m_nBufferSize = 0; fnBufferSize = 0;
m_nLen = 0; fnLen = 0;
m_nPos = 0; fnPos = 0;
m_pStream = NULL; fpStream = NULL;
delete[] m_pBuffer; delete[] fpBuffer;
m_pBuffer = NULL; fpBuffer = NULL;
} }
// --------------------------------------------------------------- // ---------------------------------------------------------------
@@ -110,7 +110,7 @@ StreamBuffer::~StreamBuffer()
// --------------------------------------------------------------- // ---------------------------------------------------------------
status_t StreamBuffer::InitCheck() status_t StreamBuffer::InitCheck()
{ {
if (m_pStream && m_pBuffer) if (fpStream && fpBuffer)
return B_OK; return B_OK;
else else
return B_ERROR; return B_ERROR;
@@ -138,17 +138,17 @@ ssize_t StreamBuffer::Read(uint8 *pinto, size_t nbytes)
ssize_t result = B_ERROR; ssize_t result = B_ERROR;
size_t rd1 = 0, rd2 = 0; size_t rd1 = 0, rd2 = 0;
rd1 = min(nbytes, m_nLen - m_nPos); rd1 = min(nbytes, fnLen - fnPos);
memcpy(pinto, m_pBuffer + m_nPos, rd1); memcpy(pinto, fpBuffer + fnPos, rd1);
m_nPos += rd1; fnPos += rd1;
if (rd1 < nbytes) { if (rd1 < nbytes) {
pinto += rd1; pinto += rd1;
result = ReadStream(); result = ReadStream();
if (result > 0) { if (result > 0) {
rd2 = min(nbytes - rd1, m_nLen); rd2 = min(nbytes - rd1, fnLen);
memcpy(pinto, m_pBuffer, rd2); memcpy(pinto, fpBuffer, rd2);
m_nPos += rd2; fnPos += rd2;
} else } else
// return error code or zero // return error code or zero
return result; return result;
@@ -162,7 +162,7 @@ ssize_t StreamBuffer::Read(uint8 *pinto, size_t nbytes)
// //
// Fills the stream buffer with data read in from the stream // Fills the stream buffer with data read in from the stream
// //
// Preconditions: m_pBuffer must be allocated and m_nBufferSize // Preconditions: fpBuffer must be allocated and fnBufferSize
// must be valid // must be valid
// //
// Parameters: // Parameters:
@@ -175,10 +175,10 @@ ssize_t StreamBuffer::Read(uint8 *pinto, size_t nbytes)
ssize_t StreamBuffer::ReadStream() ssize_t StreamBuffer::ReadStream()
{ {
ssize_t rd; ssize_t rd;
rd = m_pStream->Read(m_pBuffer, m_nBufferSize); rd = fpStream->Read(fpBuffer, fnBufferSize);
if (rd >= 0) { if (rd >= 0) {
m_nLen = rd; fnLen = rd;
m_nPos = 0; fnPos = 0;
} }
return rd; return rd;
} }