None of the users of Buf_Discard used it to get rid of only a part of

the buffer. So replace Buf_Discard by Buf_Clear which just gets rid
of the entire contents.

Submitted by:	Max Okumoto <okumoto@ucsd.edu>

1 files changed, 10 insertions, 25 deletions

diff --git a/usr.bin/make/buf.c b/usr.bin/make/buf.c
index b9a4a43..c4294bd 100644
--- a/usr.bin/make/buf.c
+++ b/usr.bin/make/buf.c
@@ -165,31 +165,6 @@ Buf_GetAll(Buffer *bp, size_t *numBytesPtr)
 
 /*-
  *-----------------------------------------------------------------------
- * Buf_Discard --
- *	Throw away bytes in a buffer.
- *
- * Results:
- *	None.
- *
- * Side Effects:
- *	The bytes are discarded.
- *
- *-----------------------------------------------------------------------
- */
-void
-Buf_Discard(Buffer *bp, size_t numBytes)
-{
-
-	if ((size_t)(bp->inPtr - bp->outPtr) <= numBytes) {
-		bp->inPtr = bp->outPtr = bp->buffer;
-		bp->left = bp->size;
-		*bp->inPtr = 0;
-	} else
-		bp->outPtr += numBytes;
-}
-
-/*-
- *-----------------------------------------------------------------------
  * Buf_Size --
  *	Returns the number of bytes in the given buffer. Doesn't include
  *	the null-terminating byte.
@@ -286,3 +261,13 @@ Buf_ReplaceLastByte(Buffer *buf, Byte byte)
 	else
 		*(buf->inPtr - 1) = byte;
 }
+
+void
+Buf_Clear(Buffer *bp)
+{
+	bp->inPtr	= bp->buffer;
+	bp->outPtr	= bp->buffer;
+	bp->left	= bp->size;
+	bp->inPtr[0]	= '\0';
+}
+