version 1.22, 2008/10/06 22:09:21 |
version 1.23, 2008/12/20 18:08:24 |
Line 108 __RCSID("$NetBSD$"); |
|
Line 108 __RCSID("$NetBSD$"); |
|
Byte *newBuf = (Byte *)bmake_realloc((bp)->buffer, newSize); \ |
Byte *newBuf = (Byte *)bmake_realloc((bp)->buffer, newSize); \ |
\ |
\ |
(bp)->inPtr = newBuf + ((bp)->inPtr - (bp)->buffer); \ |
(bp)->inPtr = newBuf + ((bp)->inPtr - (bp)->buffer); \ |
(bp)->outPtr = newBuf + ((bp)->outPtr - (bp)->buffer);\ |
|
(bp)->buffer = newBuf;\ |
(bp)->buffer = newBuf;\ |
(bp)->size = newSize;\ |
(bp)->size = newSize;\ |
(bp)->left = newSize - ((bp)->inPtr - (bp)->buffer);\ |
(bp)->left = newSize - ((bp)->inPtr - (bp)->buffer);\ |
Line 192 Buf_GetAll(Buffer bp, int *numBytesPtr) |
|
Line 191 Buf_GetAll(Buffer bp, int *numBytesPtr) |
|
{ |
{ |
|
|
if (numBytesPtr != NULL) { |
if (numBytesPtr != NULL) { |
*numBytesPtr = bp->inPtr - bp->outPtr; |
*numBytesPtr = bp->inPtr - bp->buffer; |
} |
} |
|
|
return (bp->outPtr); |
return (bp->buffer); |
} |
} |
|
|
/*- |
/*- |
*----------------------------------------------------------------------- |
*----------------------------------------------------------------------- |
* Buf_Discard -- |
* Buf_Empty -- |
* Throw away bytes in a buffer. |
* Throw away bytes in a buffer. |
* |
* |
* Results: |
* Results: |
Line 212 Buf_GetAll(Buffer bp, int *numBytesPtr) |
|
Line 211 Buf_GetAll(Buffer bp, int *numBytesPtr) |
|
*----------------------------------------------------------------------- |
*----------------------------------------------------------------------- |
*/ |
*/ |
void |
void |
Buf_Discard(Buffer bp, int numBytes) |
Buf_Empty(Buffer bp) |
{ |
{ |
|
|
if (bp->inPtr - bp->outPtr <= numBytes) { |
bp->inPtr = bp->buffer; |
bp->inPtr = bp->outPtr = bp->buffer; |
bp->left = bp->size; |
bp->left = bp->size; |
*bp->inPtr = 0; |
*bp->inPtr = 0; |
|
} else { |
|
bp->outPtr += numBytes; |
|
} |
|
} |
} |
|
|
/*- |
/*- |
Line 241 Buf_Discard(Buffer bp, int numBytes) |
|
Line 236 Buf_Discard(Buffer bp, int numBytes) |
|
int |
int |
Buf_Size(Buffer buf) |
Buf_Size(Buffer buf) |
{ |
{ |
return (buf->inPtr - buf->outPtr); |
return (buf->inPtr - buf->buffer); |
} |
} |
|
|
/*- |
/*- |
Line 274 Buf_Init(int size) |
|
Line 269 Buf_Init(int size) |
|
} |
} |
bp->left = bp->size = size; |
bp->left = bp->size = size; |
bp->buffer = bmake_malloc(size); |
bp->buffer = bmake_malloc(size); |
bp->inPtr = bp->outPtr = bp->buffer; |
bp->inPtr = bp->buffer; |
*bp->inPtr = 0; |
*bp->inPtr = 0; |
|
|
return (bp); |
return (bp); |
Line 328 Buf_Destroy(Buffer buf, Boolean freeData |
|
Line 323 Buf_Destroy(Buffer buf, Boolean freeData |
|
void |
void |
Buf_ReplaceLastByte(Buffer buf, int byte) |
Buf_ReplaceLastByte(Buffer buf, int byte) |
{ |
{ |
if (buf->inPtr == buf->outPtr) |
if (buf->inPtr == buf->buffer) |
Buf_AddByte(buf, byte); |
Buf_AddByte(buf, byte); |
else |
else |
*(buf->inPtr - 1) = byte; |
*(buf->inPtr - 1) = byte; |