[Dhcp-agent-commits] dhcp-agent dhcp-convert.c,1.18,1.19 dhcp-files.c,1.15,1.16 dhcp-util.c,1.24,1.25 dhcp-util.h,1.10,1.11

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

Update of /cvsroot/dhcp-agent/dhcp-agent
In directory usw-pr-cvs1:/tmp/cvs-serv7402

Modified Files:
	dhcp-convert.c dhcp-files.c dhcp-util.c dhcp-util.h 
Log Message:
trim_string no longer necessary -- removed; completed move to stringbuffer -- atleast for now

Index: dhcp-convert.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/dhcp-convert.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** dhcp-convert.c	3 Jul 2002 01:24:20 -0000	1.18
--- dhcp-convert.c	3 Jul 2002 03:03:26 -0000	1.19
***************
*** 297,306 ****
  void *string_to_addr_list(const char *string)
  {
      uint32_t *addr;
      list_t *addr_list = NULL;
!     char *cp, *tmp_string, *orig_string;
  
-     tmp_string = xstrdup(string); /* don't overwrite old string. */
-     trim_string(tmp_string);
      orig_string = tmp_string;
      
--- 297,313 ----
  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);
!     stringbuffer_trim_whitespace(sb);
! 
!     tmp_string = xstrdup(stringbuffer_getstring(sb));
!     destroy_stringbuffer(sb);
  
      orig_string = tmp_string;
      

Index: dhcp-files.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/dhcp-files.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** dhcp-files.c	3 Jul 2002 00:51:39 -0000	1.15
--- dhcp-files.c	3 Jul 2002 03:03:26 -0000	1.16
***************
*** 108,112 ****
  static char *get_pid_file_name(char *name)
  {
!     return (splice_string(name, ".pid"));
  }
  
--- 108,121 ----
  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;
  }
  

Index: dhcp-util.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/dhcp-util.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** dhcp-util.c	3 Jul 2002 00:51:39 -0000	1.24
--- dhcp-util.c	3 Jul 2002 03:03:26 -0000	1.25
***************
*** 379,420 ****
      return new_string;
  }
-              
- /* trim preprending and trailing space. also get rid of newlines. */
- void trim_string(char *s)
- {
-     char *start, *end, *tmp_string;
-     int len;
-     
-     len = strlen(s);
-     
-     if(len == 0)
-         return;
-     
-     tmp_string = xmalloc(len + 1);
-     strcpy(tmp_string, s);
-     tmp_string[len] = '\0';
- 
-     start = tmp_string;
- 
-     while(isspace(*start))
-         start++;
- 
-     end = &tmp_string[len - 1];
-     
-     while((end == '\0' || isspace(*end)) && end != start)  {
-         end--;
-     }
-     
-     if(end == start) /* bad. */
-         s[0] = '\0';
- 
-     end++;
-     *end = '\0';
-     
-     strcpy(s, start);
-     xfree(tmp_string);
-     
-     return;
- }
  
  /* is a valid C string? */
--- 379,382 ----

Index: dhcp-util.h
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/dhcp-util.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** dhcp-util.h	3 Jul 2002 00:51:39 -0000	1.10
--- dhcp-util.h	3 Jul 2002 03:03:26 -0000	1.11
***************
*** 61,65 ****
  extern char *splice_string(const char *s1, const char *s2);
  extern char *splice_many_strings(int num, char *s, ...);
- extern void trim_string(char *s);
  extern int string_matches(const char *s1, const char *s2);
  extern int hex_string_to_value(char *string, unsigned char *dst);
--- 61,64 ----