- (stevesk) OpenSSH CVS update:

[openssh.git] / buffer.c

diff --git a/buffer.c b/buffer.c
index 4cab175bb161313e251f0e8da9284a9221ec86e4..d993c8bcdef8982d3c71e9c9ad4d4c68418bbf07 100644 (file)
--- a/buffer.c
+++ b/buffer.c
@@ -1,20 +1,18 @@
 /*
- * 
- * buffer.c
- * 
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
- * 
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
- * 
- * Created: Sat Mar 18 04:15:33 1995 ylo
- * 
  * Functions for manipulating fifo buffers (that can grow if needed).
- * 
+ *
+ * As far as I am concerned, the code I have written for this software
+ * can be used freely for any purpose.  Any derived versions of this
+ * software must be clearly marked as such, and if the derived work is
+ * incompatible with the protocol description in the RFC file, it must be
+ * called by a name other than "ssh" or "Secure Shell".
  */
 
 #include "includes.h"
-RCSID("$Id$");
+RCSID("$OpenBSD: buffer.c,v 1.8 2000/09/07 20:27:50 deraadt Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -22,7 +20,7 @@ RCSID("$Id$");
 
 /* Initializes the buffer structure. */
 
-void 
+void
 buffer_init(Buffer *buffer)
 {
        buffer->alloc = 4096;
@@ -33,17 +31,19 @@ buffer_init(Buffer *buffer)
 
 /* Frees any memory used for the buffer. */
 
-void 
+void
 buffer_free(Buffer *buffer)
 {
        memset(buffer->buf, 0, buffer->alloc);
        xfree(buffer->buf);
 }
 
-/* Clears any data from the buffer, making it empty.  This does not actually
-   zero the memory. */
+/*
+ * Clears any data from the buffer, making it empty.  This does not actually
+ * zero the memory.
+ */
 
-void 
+void
 buffer_clear(Buffer *buffer)
 {
        buffer->offset = 0;
@@ -52,7 +52,7 @@ buffer_clear(Buffer *buffer)
 
 /* Appends data to the buffer, expanding it if necessary. */
 
-void 
+void
 buffer_append(Buffer *buffer, const char *data, unsigned int len)
 {
        char *cp;
@@ -60,11 +60,13 @@ buffer_append(Buffer *buffer, const char *data, unsigned int len)
        memcpy(cp, data, len);
 }
 
-/* Appends space to the buffer, expanding the buffer if necessary.
-   This does not actually copy the data into the buffer, but instead
-   returns a pointer to the allocated region. */
+/*
+ * Appends space to the buffer, expanding the buffer if necessary. This does
+ * not actually copy the data into the buffer, but instead returns a pointer
+ * to the allocated region.
+ */
 
-void 
+void
 buffer_append_space(Buffer *buffer, char **datap, unsigned int len)
 {
        /* If the buffer is empty, start using it from the beginning. */
@@ -79,8 +81,10 @@ restart:
                buffer->end += len;
                return;
        }
-       /* If the buffer is quite empty, but all data is at the end, move
-          the data to the beginning and retry. */
+       /*
+        * If the buffer is quite empty, but all data is at the end, move the
+        * data to the beginning and retry.
+        */
        if (buffer->offset > buffer->alloc / 2) {
                memmove(buffer->buf, buffer->buf + buffer->offset,
                        buffer->end - buffer->offset);
@@ -96,7 +100,7 @@ restart:
 
 /* Returns the number of bytes of data in the buffer. */
 
-unsigned int 
+unsigned int
 buffer_len(Buffer *buffer)
 {
        return buffer->end - buffer->offset;
@@ -104,32 +108,32 @@ buffer_len(Buffer *buffer)
 
 /* Gets data from the beginning of the buffer. */
 
-void 
+void
 buffer_get(Buffer *buffer, char *buf, unsigned int len)
 {
        if (len > buffer->end - buffer->offset)
-               fatal("buffer_get trying to get more bytes than in buffer");
+               fatal("buffer_get: trying to get more bytes than in buffer");
        memcpy(buf, buffer->buf + buffer->offset, len);
        buffer->offset += len;
 }
 
 /* Consumes the given number of bytes from the beginning of the buffer. */
 
-void 
+void
 buffer_consume(Buffer *buffer, unsigned int bytes)
 {
        if (bytes > buffer->end - buffer->offset)
-               fatal("buffer_get trying to get more bytes than in buffer");
+               fatal("buffer_consume: trying to get more bytes than in buffer");
        buffer->offset += bytes;
 }
 
 /* Consumes the given number of bytes from the end of the buffer. */
 
-void 
+void
 buffer_consume_end(Buffer *buffer, unsigned int bytes)
 {
        if (bytes > buffer->end - buffer->offset)
-               fatal("buffer_get trying to get more bytes than in buffer");
+               fatal("buffer_consume_end: trying to get more bytes than in buffer");
        buffer->end -= bytes;
 }
 
@@ -143,7 +147,7 @@ buffer_ptr(Buffer *buffer)
 
 /* Dumps the contents of the buffer to stderr. */
 
-void 
+void
 buffer_dump(Buffer *buffer)
 {
        int i;