[BACK]Return to buffer.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/Attic/buffer.c between version 1.6 and 1.6.2.4

version 1.6, 2000/04/14 10:30:30 version 1.6.2.4, 2001/03/21 18:52:37
Line 1 
Line 1 
 /*  /*
  *  
  * buffer.c  
  *  
  * Author: Tatu Ylonen <ylo@cs.hut.fi>   * Author: Tatu Ylonen <ylo@cs.hut.fi>
  *  
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland   * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved   *                    All rights reserved
  *  
  * Created: Sat Mar 18 04:15:33 1995 ylo  
  *  
  * Functions for manipulating fifo buffers (that can grow if needed).   * 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"  #include "includes.h"
 RCSID("$Id$");  RCSID("$OpenBSD$");
   
 #include "xmalloc.h"  #include "xmalloc.h"
 #include "buffer.h"  #include "buffer.h"
 #include "ssh.h"  #include "log.h"
   
 /* Initializes the buffer structure. */  /* Initializes the buffer structure. */
   
Line 55 
Line 53 
 /* Appends data to the buffer, expanding it if necessary. */  /* Appends data to the buffer, expanding it if necessary. */
   
 void  void
 buffer_append(Buffer *buffer, const char *data, unsigned int len)  buffer_append(Buffer *buffer, const char *data, u_int len)
 {  {
         char *cp;          char *cp;
         buffer_append_space(buffer, &cp, len);          buffer_append_space(buffer, &cp, len);
Line 69 
Line 67 
  */   */
   
 void  void
 buffer_append_space(Buffer *buffer, char **datap, unsigned int len)  buffer_append_space(Buffer *buffer, char **datap, u_int len)
 {  {
         /* If the buffer is empty, start using it from the beginning. */          /* If the buffer is empty, start using it from the beginning. */
         if (buffer->offset == buffer->end) {          if (buffer->offset == buffer->end) {
Line 102 
Line 100 
   
 /* Returns the number of bytes of data in the buffer. */  /* Returns the number of bytes of data in the buffer. */
   
 unsigned int  u_int
 buffer_len(Buffer *buffer)  buffer_len(Buffer *buffer)
 {  {
         return buffer->end - buffer->offset;          return buffer->end - buffer->offset;
Line 111 
Line 109 
 /* Gets data from the beginning of the buffer. */  /* Gets data from the beginning of the buffer. */
   
 void  void
 buffer_get(Buffer *buffer, char *buf, unsigned int len)  buffer_get(Buffer *buffer, char *buf, u_int len)
 {  {
         if (len > buffer->end - buffer->offset)          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");
Line 122 
Line 120 
 /* Consumes the given number of bytes from the beginning of the buffer. */  /* Consumes the given number of bytes from the beginning of the buffer. */
   
 void  void
 buffer_consume(Buffer *buffer, unsigned int bytes)  buffer_consume(Buffer *buffer, u_int bytes)
 {  {
         if (bytes > buffer->end - buffer->offset)          if (bytes > buffer->end - buffer->offset)
                 fatal("buffer_consume: trying to get more bytes than in buffer");                  fatal("buffer_consume: trying to get more bytes than in buffer");
Line 132 
Line 130 
 /* Consumes the given number of bytes from the end of the buffer. */  /* Consumes the given number of bytes from the end of the buffer. */
   
 void  void
 buffer_consume_end(Buffer *buffer, unsigned int bytes)  buffer_consume_end(Buffer *buffer, u_int bytes)
 {  {
         if (bytes > buffer->end - buffer->offset)          if (bytes > buffer->end - buffer->offset)
                 fatal("buffer_consume_end: trying to get more bytes than in buffer");                  fatal("buffer_consume_end: trying to get more bytes than in buffer");
Line 153 
Line 151 
 buffer_dump(Buffer *buffer)  buffer_dump(Buffer *buffer)
 {  {
         int i;          int i;
         unsigned char *ucp = (unsigned char *) buffer->buf;          u_char *ucp = (u_char *) buffer->buf;
   
         for (i = buffer->offset; i < buffer->end; i++)          for (i = buffer->offset; i < buffer->end; i++)
                 fprintf(stderr, " %02x", ucp[i]);                  fprintf(stderr, " %02x", ucp[i]);
Legend:
Removed from v.1.6  
changed lines
  Added in v.1.6.2.4