[dhcp-agent-commits] dhcp-agent/src dhcp-client-guile.c,1.13,1.14 Makefile.am,1.37,1.38

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

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

Modified Files:
	dhcp-client-guile.c Makefile.am 
Log Message:
moved message code to its own guile binding source

Index: dhcp-client-guile.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-client-guile.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** dhcp-client-guile.c	18 Aug 2003 01:48:51 -0000	1.13
--- dhcp-client-guile.c	18 Aug 2003 02:21:37 -0000	1.14
***************
*** 37,40 ****
--- 37,41 ----
  #include "dhcp-client.h"
  #include "dhcp-guile-util.h"
+ #include "dhcp-message-guile.h"
  #include "dhcp-client-guile.h"
  #include "dhcp-interface.h"
***************
*** 404,444 ****
  }
  
- /* * * * * * * * * * * * * * * * * * * * * * * * * * * * *  *
-  * info message, error message, and fatal message wrappers. *
-  * * * * * * * * * * * * * * * * * * * * * * * * * * * * *  */
- 
- static SCM dhcp_scm_client_info_message(SCM string)
- {
-     char *str;
- 
-     str = x_scm_string2newstr(string);
-     INFO_MESSAGE(str);
-     xfree(str);
- 
-     return SCM_BOOL_T;
- }
- 
- static SCM dhcp_scm_client_error_message(SCM string)
- {
-     char *str;
- 
-     str = x_scm_string2newstr(string);
-     ERROR_MESSAGE(str);
-     xfree(str);
- 
-     return SCM_BOOL_T;
- }
- 
- static SCM dhcp_scm_client_fatal_error_message(SCM string)
- {
-     char *str;
- 
-     str = x_scm_string2newstr(string);
-     FATAL_MESSAGE(str);
-     xfree(str);
- 
-     return SCM_BOOL_T;
- }
- 
  /* * * * * * * * * * * * * * * * * * * *
   * dhcp client control smob            *
--- 405,408 ----
***************
*** 727,733 ****
      scm_c_define_gsubr("client-do-discover-icmp-latency?", 1, 0, 0, dhcp_scm_client_do_discover_icmp_latency);
      scm_c_define_gsubr("client-configure?", 2, 0, 0, dhcp_scm_configurep);
!     scm_c_define_gsubr("client-info-message", 1, 0, 0, dhcp_scm_client_info_message);
!     scm_c_define_gsubr("client-error-message", 1, 0, 0, dhcp_scm_client_error_message);
!     scm_c_define_gsubr("client-fatal-error-message", 1, 0, 0, dhcp_scm_client_fatal_error_message);
      scm_c_define_gsubr("client-shutdown", 1, 0, 0, dhcp_scm_client_shutdown);
      scm_c_define_gsubr("client-discover-icmp-latency", 2, 0, 0, dhcp_scm_client_discover_icmp_latency);
--- 691,697 ----
      scm_c_define_gsubr("client-do-discover-icmp-latency?", 1, 0, 0, dhcp_scm_client_do_discover_icmp_latency);
      scm_c_define_gsubr("client-configure?", 2, 0, 0, dhcp_scm_configurep);
!     scm_c_define_gsubr("client-info-message", 1, 0, 0, scm_info_message);
!     scm_c_define_gsubr("client-error-message", 1, 0, 0, scm_error_message);
!     scm_c_define_gsubr("client-fatal-error-message", 1, 0, 0, scm_fatal_error_message);
      scm_c_define_gsubr("client-shutdown", 1, 0, 0, dhcp_scm_client_shutdown);
      scm_c_define_gsubr("client-discover-icmp-latency", 2, 0, 0, dhcp_scm_client_discover_icmp_latency);

Index: Makefile.am
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/Makefile.am,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** Makefile.am	12 Aug 2003 12:07:42 -0000	1.37
--- Makefile.am	18 Aug 2003 02:21:37 -0000	1.38
***************
*** 72,76 ****
  		 	dhcp-sysconf.c \
  			dhcp-client-guile.c \
! 			dhcp-guile-util.c
  
  dhcp_server_SOURCES =   dhcp-server.c \
--- 72,77 ----
  		 	dhcp-sysconf.c \
  			dhcp-client-guile.c \
! 			dhcp-guile-util.c \
! 			dhcp-message-guile.c
  
  dhcp_server_SOURCES =   dhcp-server.c \
***************
*** 85,89 ****
  			dhcp-server-client-info.c \
  			dhcp-client-info-guile.c \
! 			dhcp-lease-guile.c
  
  dhcp_client_LDADD = -ldhcputil ${GUILE_LIB}
--- 86,91 ----
  			dhcp-server-client-info.c \
  			dhcp-client-info-guile.c \
! 			dhcp-lease-guile.c \
! 			dhcp-message-guile.c
  
  dhcp_client_LDADD = -ldhcputil ${GUILE_LIB}