[dhcp-agent-commits] dhcp-agent/src dhcp-client-cache.c,1.9,1.10 dhcp-client-conf.c,1.13,1.14 dhcp-client-control.c,1.9,1.10 dhcp-convert.c,1.6,1.7 dhcp-files.c,1.4,1.5 dhcp-libutil.h,1.16,1.17 dhcp-sniff.c,1.3,1.4 dhcp-stringbuffer.c,1.8,1.9 dhcp-tokenizer.c,1.1,1.2 dhcp-util.c,1.10,1.11 dhcp-varfile.c,1.5,1.6

[<act...@us...>]

Update of /cvsroot/dhcp-agent/dhcp-agent/src
In directory sc8-pr-cvs1:/tmp/cvs-serv11127

Modified Files:
	dhcp-client-cache.c dhcp-client-conf.c dhcp-client-control.c 
	dhcp-convert.c dhcp-files.c dhcp-libutil.h dhcp-sniff.c 
	dhcp-stringbuffer.c dhcp-tokenizer.c dhcp-util.c 
	dhcp-varfile.c 
Log Message:
fixed up stringbuffer a bit

Index: dhcp-client-cache.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-client-cache.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** dhcp-client-cache.c	16 Dec 2002 07:20:41 -0000	1.9
--- dhcp-client-cache.c	23 Dec 2002 00:51:24 -0000	1.10
***************
*** 78,86 ****
  {
      char *fname;
!     stringbuffer *sb = create_stringbuffer();
      stringbuffer_aprintf(sb, "%s.%s", cc->interface, suffix);
  
      fname = xstrdup(stringbuffer_getstring(sb)); /* FIXME: use a stringbuffer associated creation routine. */
!     destroy_stringbuffer(sb);
  
      return fname;
--- 78,88 ----
  {
      char *fname;
!     stringbuffer_t *sb;
! 
!     sb = stringbuffer_create();
      stringbuffer_aprintf(sb, "%s.%s", cc->interface, suffix);
  
      fname = xstrdup(stringbuffer_getstring(sb)); /* FIXME: use a stringbuffer associated creation routine. */
!     stringbuffer_destroy(sb);
  
      return fname;

Index: dhcp-client-conf.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-client-conf.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** dhcp-client-conf.c	21 Dec 2002 18:13:10 -0000	1.13
--- dhcp-client-conf.c	23 Dec 2002 00:51:24 -0000	1.14
***************
*** 317,325 ****
  {
      char *fname;
!     stringbuffer *sb = create_stringbuffer();
      stringbuffer_aprintf(sb, "%s.%s", cc->interface, "conf");
  
      fname = xstrdup(stringbuffer_getstring(sb));
!     destroy_stringbuffer(sb);
  
      return fname;
--- 317,327 ----
  {
      char *fname;
!     stringbuffer_t *sb;
! 
!     sb = stringbuffer_create();
      stringbuffer_aprintf(sb, "%s.%s", cc->interface, "conf");
  
      fname = xstrdup(stringbuffer_getstring(sb));
!     stringbuffer_destroy(sb);
  
      return fname;

Index: dhcp-client-control.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-client-control.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** dhcp-client-control.c	21 Dec 2002 16:51:53 -0000	1.9
--- dhcp-client-control.c	23 Dec 2002 00:51:24 -0000	1.10
***************
*** 127,131 ****
      dhcp_client_control_t *dc;
      int dport, sport;
!     stringbuffer *filter;
      eth_addr_t interface_addr;
  
--- 127,131 ----
      dhcp_client_control_t *dc;
      int dport, sport;
!     stringbuffer_t *filter;
      eth_addr_t interface_addr;
  
***************
*** 167,171 ****
      /* Create filter. */
  
!     filter = create_stringbuffer();
      stringbuffer_aprintf(filter, "arp or icmp or (udp and (src port %d or dst port %d))",
                           dport, sport);
--- 167,171 ----
      /* Create filter. */
  
!     filter = stringbuffer_create();
      stringbuffer_aprintf(filter, "arp or icmp or (udp and (src port %d or dst port %d))",
                           dport, sport);
***************
*** 179,183 ****
      }
  
!     destroy_stringbuffer(filter);
  
      /* Additional fields. */
--- 179,183 ----
      }
  
!     stringbuffer_destroy(filter);
  
      /* Additional fields. */

Index: dhcp-convert.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-convert.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** dhcp-convert.c	19 Dec 2002 03:30:15 -0000	1.6
--- dhcp-convert.c	23 Dec 2002 00:51:24 -0000	1.7
***************
*** 273,277 ****
  char *network_byte_to_string_byte(const unsigned char *data, int len)
  {
!     stringbuffer *sb;
      char *s;
  
--- 273,277 ----
  char *network_byte_to_string_byte(const unsigned char *data, int len)
  {
!     stringbuffer_t *sb;
      char *s;
  
***************
*** 279,288 ****
          return NULL;
  
!     sb = create_stringbuffer();
  
      stringbuffer_aprintf(sb, "0x%hhx", *(unsigned char *)data);
  
      s = xstrdup(stringbuffer_getstring(sb));
!     destroy_stringbuffer(sb);
  
      return s;
--- 279,288 ----
          return NULL;
  
!     sb = stringbuffer_create();
  
      stringbuffer_aprintf(sb, "0x%hhx", *(unsigned char *)data);
  
      s = xstrdup(stringbuffer_getstring(sb));
!     stringbuffer_destroy(sb);
  
      return s;
***************
*** 326,330 ****
  char *network_addr_list_to_string(const unsigned char *data, int len)
  {
!     stringbuffer *sb;
      char *string;
  
--- 326,330 ----
  char *network_addr_list_to_string(const unsigned char *data, int len)
  {
!     stringbuffer_t *sb;
      char *string;
  
***************
*** 334,338 ****
      }
  
!     sb = create_stringbuffer();
  
      while(len > 0) {
--- 334,338 ----
      }
  
!     sb = stringbuffer_create();
  
      while(len > 0) {
***************
*** 361,365 ****
  
          WARN_MESSAGE("network addr to list: no valid addresses passed.");
!         destroy_stringbuffer(sb);
          xfree(string);
          return NULL;
--- 361,365 ----
  
          WARN_MESSAGE("network addr to list: no valid addresses passed.");
!         stringbuffer_destroy(sb);
          xfree(string);
          return NULL;
***************
*** 367,371 ****
      } else {
  
!         destroy_stringbuffer(sb);
          return string;
      }
--- 367,371 ----
      } else {
  
!         stringbuffer_destroy(sb);
          return string;
      }
***************
*** 388,397 ****
  void *string_to_addr_list(const char *string)
  {
!     stringbuffer *sb;
      uint32_t *addr;
      list_t *addr_list = NULL;
      char *cp, *tmp_string, *orig_string;;
  
!     sb = create_stringbuffer();
      stringbuffer_append(sb, string);
      stringbuffer_trim_newline(sb);
--- 388,397 ----
  void *string_to_addr_list(const char *string)
  {
!     stringbuffer_t *sb;
      uint32_t *addr;
      list_t *addr_list = NULL;
      char *cp, *tmp_string, *orig_string;;
  
!     sb = stringbuffer_create();
      stringbuffer_append(sb, string);
      stringbuffer_trim_newline(sb);
***************
*** 399,403 ****
  
      tmp_string = xstrdup(stringbuffer_getstring(sb));
!     destroy_stringbuffer(sb);
  
      orig_string = tmp_string;
--- 399,403 ----
  
      tmp_string = xstrdup(stringbuffer_getstring(sb));
!     stringbuffer_destroy(sb);
  
      orig_string = tmp_string;
***************
*** 539,543 ****
  char *int_to_string(const unsigned char *data, int data_len, size_t size, int si)
  {
!     stringbuffer *sb;
      char *string;
  
--- 539,543 ----
  char *int_to_string(const unsigned char *data, int data_len, size_t size, int si)
  {
!     stringbuffer_t *sb;
      char *string;
  
***************
*** 545,549 ****
          return NULL;
  
!     sb = create_stringbuffer();
      if(si) { /* signed. */
  
--- 545,549 ----
          return NULL;
  
!     sb = stringbuffer_create();
      if(si) { /* signed. */
  
***************
*** 584,588 ****
  
      string = xstrdup(stringbuffer_getstring(sb));
!     destroy_stringbuffer(sb);
      return string;
  }
--- 584,588 ----
  
      string = xstrdup(stringbuffer_getstring(sb));
!     stringbuffer_destroy(sb);
      return string;
  }
***************
*** 693,697 ****
  {
  
!     stringbuffer *sb;
      char *string;
  
--- 693,697 ----
  {
  
!     stringbuffer_t *sb;
      char *string;
  
***************
*** 699,703 ****
          return NULL;
  
!     sb = create_stringbuffer();
  
      while(len > 0) {
--- 699,703 ----
          return NULL;
  
!     sb = stringbuffer_create();
  
      while(len > 0) {
***************
*** 726,733 ****
          WARN_MESSAGE("uint16_t list to string: no valid integers passed.");
          xfree(string);
!         destroy_stringbuffer(sb);
          return NULL;
      } else {
!         destroy_stringbuffer(sb);
          return string;
      }
--- 726,733 ----
          WARN_MESSAGE("uint16_t list to string: no valid integers passed.");
          xfree(string);
!         stringbuffer_destroy(sb);
          return NULL;
      } else {
!         stringbuffer_destroy(sb);
          return string;
      }

Index: dhcp-files.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-files.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dhcp-files.c	21 Dec 2002 17:12:34 -0000	1.4
--- dhcp-files.c	23 Dec 2002 00:51:25 -0000	1.5
***************
*** 1,3 ****
--- 1,4 ----
  /* $Header$
+  *
   * Copyright 2002 Thamer Alharbash <tm...@wh...> 
   * 
***************
*** 105,117 ****
  static char *get_pid_file_name(char *name)
  {
!     stringbuffer *sb;
      char *fname;
  
!     sb = create_stringbuffer();
      stringbuffer_append(sb, name);
      stringbuffer_append(sb, ".pid");
  
      fname = xstrdup(stringbuffer_getstring(sb));
!     destroy_stringbuffer(sb);
      return fname;
  }
--- 106,118 ----
  static char *get_pid_file_name(char *name)
  {
!     stringbuffer_t *sb;
      char *fname;
  
!     sb = stringbuffer_create();
      stringbuffer_append(sb, name);
      stringbuffer_append(sb, ".pid");
  
      fname = xstrdup(stringbuffer_getstring(sb));
!     stringbuffer_destroy(sb);
      return fname;
  }

Index: dhcp-libutil.h
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-libutil.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** dhcp-libutil.h	22 Dec 2002 08:31:30 -0000	1.16
--- dhcp-libutil.h	23 Dec 2002 00:51:25 -0000	1.17
***************
*** 57,61 ****
      size_t capacity;
      char *buf;
! } stringbuffer;
  
  /* utility data structures. */
--- 57,61 ----
      size_t capacity;
      char *buf;
! } stringbuffer_t;
  
  /* utility data structures. */
***************
*** 86,90 ****
      FILE *fp;
      int line_no;
!     stringbuffer *data_buff;
      token_t peek_value;
      uint8_t peeked;
--- 86,90 ----
      FILE *fp;
      int line_no;
!     stringbuffer_t *data_buff;
      token_t peek_value;
      uint8_t peeked;
***************
*** 95,100 ****
      char *filename;
      tokenizer_t *tokenizer;
!     stringbuffer *var_name;
!     stringbuffer *var_val;
      uint8_t mode;
  } varfile_t;
--- 95,100 ----
      char *filename;
      tokenizer_t *tokenizer;
!     stringbuffer_t *var_name;
!     stringbuffer_t *var_val;
      uint8_t mode;
  } varfile_t;
***************
*** 206,226 ****
  
  /* stringbuffer. */
! extern stringbuffer *create_stringbuffer(void);
! extern void destroy_stringbuffer(stringbuffer * sb);
! extern void stringbuffer_append(stringbuffer * sb, const char *s);
! extern stringbuffer *stringbuffer_trim_whitespace(stringbuffer * sb);
! extern char *stringbuffer_get_last_occurance(stringbuffer * sb, char c);
! extern void stringbuffer_trim_newline(stringbuffer * sb);
! extern const char *stringbuffer_getstring(stringbuffer * sb);
! extern void stringbuffer_aprintf(stringbuffer * sb, const char *fmt, ...);
! extern void stringbuffer_aprintf_align(stringbuffer * sb, int begin, int end, const char *fmt, ...);
! extern void stringbuffer_avprintf(stringbuffer * sb, const char *fmt, va_list ap);
! extern void stringbuffer_append_c(stringbuffer * sb, char c);
! extern void stringbuffer_clear(stringbuffer * sb);
! extern const char *stringbuffer_getnextline(stringbuffer * sb, const char *cptr);
! extern int stringbuffer_marknewlines(stringbuffer * sb);
! extern void stringbuffer_set(stringbuffer * dest, const char *s);
! extern void stringbuffer_align(stringbuffer * sb, int begin, int end);
! extern int stringbuffer_getlen(stringbuffer * sb);
  
  /* RTT mechanism. */
--- 206,229 ----
  
  /* stringbuffer. */
! extern stringbuffer_t *stringbuffer_create(void);
! extern void stringbuffer_destroy(stringbuffer_t *sb);
! extern void stringbuffer_clear(stringbuffer_t *sb);
! extern void stringbuffer_append_c(stringbuffer_t *sb, char c);
! extern void stringbuffer_append(stringbuffer_t *sb, const char *s);
! extern stringbuffer_t *stringbuffer_trim_whitespace(stringbuffer_t *sb);
! extern char *stringbuffer_get_last_occurance(stringbuffer_t *sb, char c);
! extern void stringbuffer_trim_newline(stringbuffer_t *sb);
! extern const char *stringbuffer_getstring(stringbuffer_t *sb);
! extern void stringbuffer_set(stringbuffer_t *dest, const char *s);
! extern void stringbuffer_copy(stringbuffer_t *dest, stringbuffer_t *src);
! extern void stringbuffer_replace_c(stringbuffer_t *sb, char c, char replace);
! extern void stringbuffer_align(stringbuffer_t *sb, int begin, int end);
! extern void stringbuffer_avprintf_align(stringbuffer_t *sb, int start, int end, const char *fmt, va_list ap);
! extern void stringbuffer_aprintf(stringbuffer_t *sb, const char *fmt, ...);
! extern void stringbuffer_aprintf_align(stringbuffer_t *sb, int start, int end, const char *fmt, ...);
! extern void stringbuffer_avprintf(stringbuffer_t *sb, const char *fmt, va_list ap);
! extern int stringbuffer_marknewlines(stringbuffer_t *sb);
! extern const char *stringbuffer_getnextline(stringbuffer_t *sb, const char *cptr);
! extern int stringbuffer_getlen(stringbuffer_t *sb);
  
  /* RTT mechanism. */

Index: dhcp-sniff.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-sniff.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dhcp-sniff.c	16 Nov 2002 00:23:44 -0000	1.3
--- dhcp-sniff.c	23 Dec 2002 00:51:25 -0000	1.4
***************
*** 53,57 ****
      int retval;
      int sport, dport;
!     stringbuffer *filter;
      print_packet p_packet = print_dhcp_packet_verbose;
      list_t *available_interfaces;
--- 53,57 ----
      int retval;
      int sport, dport;
!     stringbuffer_t *filter;
      print_packet p_packet = print_dhcp_packet_verbose;
      list_t *available_interfaces;
***************
*** 114,118 ****
      }
  
!     filter = create_stringbuffer();
      stringbuffer_aprintf(filter, "arp or icmp or (udp and (port %d or port %d))", dport, sport);
  
--- 114,118 ----
      }
  
!     filter = stringbuffer_create();
      stringbuffer_aprintf(filter, "arp or icmp or (udp and (port %d or port %d))", dport, sport);
  
***************
*** 120,124 ****
      net = rawnet_create(interface_name, stringbuffer_getstring(filter), 0, 0, 1);
  
!     destroy_stringbuffer(filter);
  
      if(net == NULL) {
--- 120,124 ----
      net = rawnet_create(interface_name, stringbuffer_getstring(filter), 0, 0, 1);
  
!     stringbuffer_destroy(filter);
  
      if(net == NULL) {

Index: dhcp-stringbuffer.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-stringbuffer.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** dhcp-stringbuffer.c	21 Dec 2002 16:51:53 -0000	1.8
--- dhcp-stringbuffer.c	23 Dec 2002 00:51:25 -0000	1.9
***************
*** 107,110 ****
--- 107,119 ----
  }
  
+ /* zap newlines by placing spaces in their place.
+  * we use this before aligning. */
+ static void stringbuffer_zap_newline(stringbuffer_t *sb)
+ {
+ 
+     stringbuffer_replace_c(sb, '\n', ' ');
+     stringbuffer_replace_c(sb, '\r', ' ');
+ }
+ 
  /* * * * * * * * * * * * * * *
   * stringbuffer routines.    *
***************
*** 112,120 ****
  
  /* create a new stringbuffer */
! stringbuffer *create_stringbuffer(void)
  {
!     stringbuffer *sb;
  
!     sb = xmalloc(sizeof(stringbuffer));
      sb->len = 0;
      sb->capacity = 0;
--- 121,129 ----
  
  /* create a new stringbuffer */
! stringbuffer_t *stringbuffer_create(void)
  {
!     stringbuffer_t *sb;
  
!     sb = xmalloc(sizeof(stringbuffer_t));
      sb->len = 0;
      sb->capacity = 0;
***************
*** 125,129 ****
  
  /* destroy the stringbuffer */
! void destroy_stringbuffer(stringbuffer * sb)
  {
      xfree(sb->buf);
--- 134,138 ----
  
  /* destroy the stringbuffer */
! void stringbuffer_destroy(stringbuffer_t *sb)
  {
      xfree(sb->buf);
***************
*** 132,136 ****
  
  /* clear a string. */
! void stringbuffer_clear(stringbuffer * sb)
  {
      sb->len = 0;
--- 141,145 ----
  
  /* clear a string. */
! void stringbuffer_clear(stringbuffer_t *sb)
  {
      sb->len = 0;
***************
*** 139,143 ****
  
  /* append character to stringbuffer */
! void stringbuffer_append_c(stringbuffer * sb, char c)
  {
      if(sb->capacity <= (sb->len)) {
--- 148,152 ----
  
  /* append character to stringbuffer */
! void stringbuffer_append_c(stringbuffer_t *sb, char c)
  {
      if(sb->capacity <= (sb->len)) {
***************
*** 152,156 ****
  
  /* append string to stringbuffer */
! void stringbuffer_append(stringbuffer * sb, const char *s)
  {
      int len = strlen(s);
--- 161,165 ----
  
  /* append string to stringbuffer */
! void stringbuffer_append(stringbuffer_t *sb, const char *s)
  {
      int len = strlen(s);
***************
*** 186,190 ****
  /* FIXME: use memcpy() */
  /* remove whitespace (including tabs) */
! stringbuffer *stringbuffer_trim_whitespace(stringbuffer * sb)
  {
      char *ptr, *curptr;
--- 195,199 ----
  /* FIXME: use memcpy() */
  /* remove whitespace (including tabs) */
! stringbuffer_t *stringbuffer_trim_whitespace(stringbuffer_t *sb)
  {
      char *ptr, *curptr;
***************
*** 234,238 ****
  
  /* get the last occurance of a specific character. useful for slicing. */
! char *stringbuffer_get_last_occurance(stringbuffer * sb, char c)
  {
      char *ptr, *ptrend = NULL;
--- 243,247 ----
  
  /* get the last occurance of a specific character. useful for slicing. */
! char *stringbuffer_get_last_occurance(stringbuffer_t *sb, char c)
  {
      char *ptr, *ptrend = NULL;
***************
*** 248,252 ****
  
  /* remove the last newline character. */
! void stringbuffer_trim_newline(stringbuffer * sb)
  {
      char *ptr;
--- 257,261 ----
  
  /* remove the last newline character. */
! void stringbuffer_trim_newline(stringbuffer_t *sb)
  {
      char *ptr;
***************
*** 268,272 ****
  
  /* return the C string from the buffer. */
! const char *stringbuffer_getstring(stringbuffer * sb)
  {
      return sb->buf;
--- 277,281 ----
  
  /* return the C string from the buffer. */
! const char *stringbuffer_getstring(stringbuffer_t *sb)
  {
      return sb->buf;
***************
*** 274,278 ****
  
  /* set a string into a stringbuffer */
! void stringbuffer_set(stringbuffer * dest, const char *s)
  {
      stringbuffer_clear(dest); /* zap */
--- 283,287 ----
  
  /* set a string into a stringbuffer */
! void stringbuffer_set(stringbuffer_t *dest, const char *s)
  {
      stringbuffer_clear(dest); /* zap */
***************
*** 281,285 ****
  
  /* copy a stringbuffer into another stringbuffer */
! void stringbuffer_copy(stringbuffer * dest, stringbuffer * src)
  {
      stringbuffer_set(dest, stringbuffer_getstring(src));
--- 290,294 ----
  
  /* copy a stringbuffer into another stringbuffer */
! void stringbuffer_copy(stringbuffer_t *dest, stringbuffer_t *src)
  {
      stringbuffer_set(dest, stringbuffer_getstring(src));
***************
*** 287,291 ****
  
  /* replace in stringbuffer occurances of c with replace */
! void stringbuffer_replace_c(stringbuffer * sb, char c, char replace)
  {
      char *ptr;
--- 296,300 ----
  
  /* replace in stringbuffer occurances of c with replace */
! void stringbuffer_replace_c(stringbuffer_t *sb, char c, char replace)
  {
      char *ptr;
***************
*** 297,314 ****
  }
  
- /* zap newlines by placing spaces in their place.
-  * we use this before aligning. */
- static void stringbuffer_zap_newline(stringbuffer * sb)
- {
- 
-     stringbuffer_replace_c(sb, '\n', ' ');
-     stringbuffer_replace_c(sb, '\r', ' ');
- }
- 
  /* align a stringbuffer on begin and end columns. */
! void stringbuffer_align(stringbuffer * sb, int begin, int end)
  {
      char *ptr, *word_string;
!     stringbuffer *aligned_string;
      int len, i;
  
--- 306,314 ----
  }
  
  /* align a stringbuffer on begin and end columns. */
! void stringbuffer_align(stringbuffer_t *sb, int begin, int end)
  {
      char *ptr, *word_string;
!     stringbuffer_t *aligned_string;
      int len, i;
  
***************
*** 316,320 ****
      stringbuffer_zap_newline(sb);
  
!     aligned_string = create_stringbuffer();
      ptr = sb->buf;
  
--- 316,320 ----
      stringbuffer_zap_newline(sb);
  
!     aligned_string = stringbuffer_create();
      ptr = sb->buf;
  
***************
*** 338,342 ****
  
      stringbuffer_copy(sb, aligned_string);
!     destroy_stringbuffer(aligned_string);
  
      return;
--- 338,342 ----
  
      stringbuffer_copy(sb, aligned_string);
!     stringbuffer_destroy(aligned_string);
  
      return;
***************
*** 346,352 ****
  
  /* append vprintf with alignment. */
! void stringbuffer_avprintf_align(stringbuffer * sb, int start, int end, const char *fmt, va_list ap)
  {
!     stringbuffer *tmp_sb;
      char *str;
      int total, len;
--- 346,352 ----
  
  /* append vprintf with alignment. */
! void stringbuffer_avprintf_align(stringbuffer_t *sb, int start, int end, const char *fmt, va_list ap)
  {
!     stringbuffer_t *tmp_sb;
      char *str;
      int total, len;
***************
*** 366,370 ****
      if(start != 0 && end != 0) {
  
!         tmp_sb = create_stringbuffer();
  
          stringbuffer_append(tmp_sb, str);
--- 366,370 ----
      if(start != 0 && end != 0) {
  
!         tmp_sb = stringbuffer_create();
  
          stringbuffer_append(tmp_sb, str);
***************
*** 372,376 ****
          stringbuffer_append(sb, stringbuffer_getstring(tmp_sb));
  
!         destroy_stringbuffer(tmp_sb);
  
      } else {
--- 372,376 ----
          stringbuffer_append(sb, stringbuffer_getstring(tmp_sb));
  
!         stringbuffer_destroy(tmp_sb);
  
      } else {
***************
*** 384,388 ****
  
  /* append printf. */
! void stringbuffer_aprintf(stringbuffer * sb, const char *fmt, ...)
  {
      va_list ap;
--- 384,388 ----
  
  /* append printf. */
! void stringbuffer_aprintf(stringbuffer_t *sb, const char *fmt, ...)
  {
      va_list ap;
***************
*** 396,400 ****
  
  /* append printf with alignment. */
! void stringbuffer_aprintf_align(stringbuffer * sb, int start, int end, const char *fmt, ...)
  {
      va_list ap;
--- 396,400 ----
  
  /* append printf with alignment. */
! void stringbuffer_aprintf_align(stringbuffer_t *sb, int start, int end, const char *fmt, ...)
  {
      va_list ap;
***************
*** 408,412 ****
  
  /* append vprintf. */
! void stringbuffer_avprintf(stringbuffer * sb, const char *fmt, va_list ap)
  {
      stringbuffer_avprintf_align(sb, 0, 0, fmt, ap);
--- 408,412 ----
  
  /* append vprintf. */
! void stringbuffer_avprintf(stringbuffer_t *sb, const char *fmt, va_list ap)
  {
      stringbuffer_avprintf_align(sb, 0, 0, fmt, ap);
***************
*** 424,428 ****
   * null terminators inside of them.
   */
! int stringbuffer_marknewlines(stringbuffer * sb)
  {
      char *c;
--- 424,428 ----
   * null terminators inside of them.
   */
! int stringbuffer_marknewlines(stringbuffer_t *sb)
  {
      char *c;
***************
*** 451,455 ****
  
  /* called _after_ newlines are marked. */
! const char *stringbuffer_getnextline(stringbuffer * sb, const char *cptr)
  {
      const char *ptr;
--- 451,455 ----
  
  /* called _after_ newlines are marked. */
! const char *stringbuffer_getnextline(stringbuffer_t *sb, const char *cptr)
  {
      const char *ptr;
***************
*** 475,479 ****
  }
  
! int stringbuffer_getlen(stringbuffer * sb)
  {
      return sb->len;
--- 475,479 ----
  }
  
! int stringbuffer_getlen(stringbuffer_t *sb)
  {
      return sb->len;

Index: dhcp-tokenizer.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-tokenizer.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dhcp-tokenizer.c	22 Dec 2002 08:31:30 -0000	1.1
--- dhcp-tokenizer.c	23 Dec 2002 00:51:25 -0000	1.2
***************
*** 423,427 ****
      tokenizer->fp = fp;
      tokenizer->line_no = 1;
!     tokenizer->data_buff = create_stringbuffer();
      tokenizer->peeked = 0;
  
--- 423,427 ----
      tokenizer->fp = fp;
      tokenizer->line_no = 1;
!     tokenizer->data_buff = stringbuffer_create();
      tokenizer->peeked = 0;
  
***************
*** 433,437 ****
  {
      fclose(tokenizer->fp);
!     destroy_stringbuffer(tokenizer->data_buff);
      xfree(tokenizer);
  
--- 433,437 ----
  {
      fclose(tokenizer->fp);
!     stringbuffer_destroy(tokenizer->data_buff);
      xfree(tokenizer);
  

Index: dhcp-util.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-util.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** dhcp-util.c	21 Dec 2002 16:51:53 -0000	1.10
--- dhcp-util.c	23 Dec 2002 00:51:25 -0000	1.11
***************
*** 53,57 ****
  
  /* append with colon seperation -- utility routine for message_proc. */
! static void message_append_colon_sep(stringbuffer * sb, const char *str)
  {
      if(str != NULL)
--- 53,57 ----
  
  /* append with colon seperation -- utility routine for message_proc. */
! static void message_append_colon_sep(stringbuffer_t *sb, const char *str)
  {
      if(str != NULL)
***************
*** 65,77 ****
                           const char *file, const char *fmt, va_list ap)
  {
!     static stringbuffer *prefix_sb = NULL;
!     static stringbuffer *msg_sb = NULL;
      const char *ptr = NULL;
  
      if(msg_sb == NULL)
!         msg_sb = create_stringbuffer();
  
      if(prefix_sb == NULL)
!         prefix_sb = create_stringbuffer();
  
      stringbuffer_clear(msg_sb);
--- 65,77 ----
                           const char *file, const char *fmt, va_list ap)
  {
!     static stringbuffer_t *prefix_sb = NULL;
!     static stringbuffer_t *msg_sb = NULL;
      const char *ptr = NULL;
  
      if(msg_sb == NULL)
!         msg_sb = stringbuffer_create();
  
      if(prefix_sb == NULL)
!         prefix_sb = stringbuffer_create();
  
      stringbuffer_clear(msg_sb);
***************
*** 538,544 ****
  {
      char *string;
!     stringbuffer *sb;
  
!     sb = create_stringbuffer();
      stringbuffer_aprintf(sb, "%x:%x:%x:%x:%x:%x", eth_addr.data[0], eth_addr.data[1], 
                           eth_addr.data[2], eth_addr.data[3], eth_addr.data[4], eth_addr.data[5]);
--- 538,544 ----
  {
      char *string;
!     stringbuffer_t *sb;
  
!     sb = stringbuffer_create();
      stringbuffer_aprintf(sb, "%x:%x:%x:%x:%x:%x", eth_addr.data[0], eth_addr.data[1], 
                           eth_addr.data[2], eth_addr.data[3], eth_addr.data[4], eth_addr.data[5]);
***************
*** 546,550 ****
      string = xstrdup(stringbuffer_getstring(sb));
  
!     destroy_stringbuffer(sb);
      return string;
  
--- 546,550 ----
      string = xstrdup(stringbuffer_getstring(sb));
  
!     stringbuffer_destroy(sb);
      return string;
  

Index: dhcp-varfile.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-varfile.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dhcp-varfile.c	22 Dec 2002 08:31:30 -0000	1.5
--- dhcp-varfile.c	23 Dec 2002 00:51:25 -0000	1.6
***************
*** 55,60 ****
      varfile = xmalloc(sizeof(varfile_t));
      varfile->filename = xstrdup(filename);
!     varfile->var_name = create_stringbuffer();
!     varfile->var_val = create_stringbuffer();
      varfile->tokenizer = tokenizer_create(filename);
      varfile->mode = mode;
--- 55,60 ----
      varfile = xmalloc(sizeof(varfile_t));
      varfile->filename = xstrdup(filename);
!     varfile->var_name = stringbuffer_create();
!     varfile->var_val = stringbuffer_create();
      varfile->tokenizer = tokenizer_create(filename);
      varfile->mode = mode;
***************
*** 65,70 ****
  {
      tokenizer_destroy(varfile->tokenizer);
!     destroy_stringbuffer(varfile->var_name);
!     destroy_stringbuffer(varfile->var_val);
      xfree(varfile->filename);
      xfree(varfile);
--- 65,70 ----
  {
      tokenizer_destroy(varfile->tokenizer);
!     stringbuffer_destroy(varfile->var_name);
!     stringbuffer_destroy(varfile->var_val);
      xfree(varfile->filename);
      xfree(varfile);