[BACK]Return to buf.h CVS log [TXT][DIR] Up to [local] / src / usr.bin / make

Diff for /src/usr.bin/make/buf.h between version 1.14 and 1.15

version 1.14, 2001/05/03 13:41:01 version 1.15, 2001/05/23 12:34:40
Line 1 
Line 1 
   #ifndef _BUF_H
   #define _BUF_H
   
 /*      $OpenPackages$ */  /*      $OpenPackages$ */
 /*      $OpenBSD$       */  /*      $OpenBSD$       */
 /*      $NetBSD: buf.h,v 1.7 1996/12/31 17:53:22 christos Exp $ */  /*      $NetBSD: buf.h,v 1.7 1996/12/31 17:53:22 christos Exp $ */
Line 69 
Line 72 
  *      from: @(#)buf.h 8.1 (Berkeley) 6/6/93   *      from: @(#)buf.h 8.1 (Berkeley) 6/6/93
  */   */
   
 /*-  /*
  * buf.h --   * buf
  *      Header for users of the buf library.   *      Support for extensible char buffers.
    *      One adds chars to a buffer, then retrieves the contents using
    *      Buf_Retrieve (no copy involved), or releases the memory using
    *      Buf_Destroy.
  */   */
   
 #ifndef _BUF_H  
 #define _BUF_H  
   
 #include    "sprite.h"  
   
 /* Internal data structures and functions. BUFFER is visible so  /* Internal data structures and functions. BUFFER is visible so
  * that users can allocate the memory themselves.  */   * that users can allocate the memory themselves.  */
 typedef struct Buffer_ {  typedef struct Buffer_ {
Line 87 
Line 89 
     char    *endPtr;    /* End of allocated space. */      char    *endPtr;    /* End of allocated space. */
 } BUFFER;  } BUFFER;
   
 typedef struct Buffer_ *Buffer;  
   
 /* Internal support for Buf_AddChar.  */  /* Internal support for Buf_AddChar.  */
 extern void BufOverflow(Buffer);  extern void BufOverflow(Buffer);
   
   
 /* User interface */  /* User interface */
   
 /* Buf_AddChars -- Add a number of chars to the buffer.  */  /* Buf_AddChars(buf, n, str);
    *      Adds n chars to buffer buf starting from str. */
 extern void Buf_AddChars(Buffer, size_t, const char *);  extern void Buf_AddChars(Buffer, size_t, const char *);
 /* Buf_Reset -- Remove all chars from a buffer.  */  /* Buf_Reset(buf);
    *      Empties buffer.  */
 #define Buf_Reset(bp)   ((void)((bp)->inPtr = (bp)->buffer))  #define Buf_Reset(bp)   ((void)((bp)->inPtr = (bp)->buffer))
 /* Buf_Size -- Return the number of chars in the given buffer.  /* n = Buf_Size(buf);
    *      Returns number of chars currently in buf.
  *      Doesn't include the null-terminating char.  */   *      Doesn't include the null-terminating char.  */
 #define Buf_Size(bp)    ((size_t)((bp)->inPtr - (bp)->buffer))  #define Buf_Size(bp)    ((size_t)((bp)->inPtr - (bp)->buffer))
 /* Buf_Init -- Initialize a buffer. If no initial size is given,  /* Buf_Init(buf, init);
  *      a reasonable default is used.  */   *      Initializes a buffer, to hold approximately init chars.
    *      Set init to 0 if you have no idea.  */
 extern void Buf_Init(Buffer, size_t);  extern void Buf_Init(Buffer, size_t);
 /* Buf_Destroy -- Nuke a buffer and all its resources.  */  /* Buf_Destroy(buf);
    *      Nukes a buffer and all its resources.   */
 #define Buf_Destroy(bp) ((void)free((bp)->buffer))  #define Buf_Destroy(bp) ((void)free((bp)->buffer))
 /* Buf_Retrieve -- Retrieve data from a buffer, as a NULL terminated string.  */  /* str = Buf_Retrieve(buf);
    *      Retrieves data from a buffer, as a NULL terminated string.  */
 #define Buf_Retrieve(bp)        (*(bp)->inPtr = '\0', (bp)->buffer)  #define Buf_Retrieve(bp)        (*(bp)->inPtr = '\0', (bp)->buffer)
 /* Buf_AddChar -- Add a single char to buffer.  */  /* Buf_AddChar(buf, c);
    *      Adds a single char to buffer.   */
 #define Buf_AddChar(bp, byte)                   \  #define Buf_AddChar(bp, byte)                   \
 do {                                            \  do {                                            \
         if ((bp)->endPtr - (bp)->inPtr <= 1)    \          if ((bp)->endPtr - (bp)->inPtr <= 1)    \
Line 116 
Line 124 
         *(bp)->inPtr++ = (byte);                \          *(bp)->inPtr++ = (byte);                \
 } while (0)  } while (0)
   
 /* Buf_AddSpace -- Add a space to buffer.  */  /* Buf_AddSpace(buf);
    *      Adds a space to buffer.  */
 #define Buf_AddSpace(b)                 Buf_AddChar((b), ' ')  #define Buf_AddSpace(b)                 Buf_AddChar((b), ' ')
 /* Buf_AddString -- Add the contents of a NULL terminated string to buffer.  */  /* Buf_AddString(buf, str);
    *      Adds the contents of a NULL terminated string to buffer.  */
 #define Buf_AddString(b, s)             Buf_AddChars((b), strlen(s), (s))  #define Buf_AddString(b, s)             Buf_AddChars((b), strlen(s), (s))
 /* Buf_AddInterval -- Add characters between pointers s and e to buffer.  */  /* Buf_Addi(buf, s, e);
 #define Buf_AddInterval(b, s, e)        Buf_AddChars((b), (e) - (s), (s))   *      Adds characters between s and e to buffer.  */
   #define Buf_Addi(b, s, e)       Buf_AddChars((b), (e) - (s), (s))
   
   /* Buf_KillTrailingSpaces(buf);
    *      Removes non-backslashed spaces at the end of a buffer. */
 extern void Buf_KillTrailingSpaces(Buffer);  extern void Buf_KillTrailingSpaces(Buffer);
   
 #endif /* _BUF_H */  #endif /* _BUF_H */
Legend:
Removed from v.1.14  
changed lines
  Added in v.1.15