[dhcp-agent-commits] dhcp-agent/src dhcp-client-guile.c,1.10,1.11

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

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

Modified Files:
	dhcp-client-guile.c 
Log Message:
code clean up

Index: dhcp-client-guile.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-client-guile.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** dhcp-client-guile.c	28 Jun 2003 17:33:55 -0000	1.10
--- dhcp-client-guile.c	28 Jun 2003 17:40:10 -0000	1.11
***************
*** 160,166 ****
      /* do assertions */
      SCM_ASSERT(SCM_SMOB_PREDICATE(client_control_tag, scm_dc),
!                scm_dc, SCM_ARG1, "client-interface-up");
  
!     SCM_ASSERT(SCM_SYMBOLP(scm_option), scm_option, SCM_ARG2, "client-interface-up");
  
      client_control_smob = (client_control_smob_t *)SCM_SMOB_DATA(scm_dc);
--- 160,166 ----
      /* do assertions */
      SCM_ASSERT(SCM_SMOB_PREDICATE(client_control_tag, scm_dc),
!                scm_dc, SCM_ARG1, "client-configure?");
  
!     SCM_ASSERT(SCM_SYMBOLP(scm_option), scm_option, SCM_ARG2, "client-configure?");
  
      client_control_smob = (client_control_smob_t *)SCM_SMOB_DATA(scm_dc);
***************
*** 200,204 ****
      /* do assertions */
      SCM_ASSERT(SCM_SMOB_PREDICATE(client_control_tag, scm_dc),
!                scm_dc, SCM_ARG1, "client-interface-up");
  
      client_control_smob = (client_control_smob_t *)SCM_SMOB_DATA(scm_dc);
--- 200,204 ----
      /* do assertions */
      SCM_ASSERT(SCM_SMOB_PREDICATE(client_control_tag, scm_dc),
!                scm_dc, SCM_ARG1, "client-get-default-mtu");
  
      client_control_smob = (client_control_smob_t *)SCM_SMOB_DATA(scm_dc);
***************
*** 219,223 ****
      /* do assertions */
      SCM_ASSERT(SCM_SMOB_PREDICATE(client_control_tag, scm_dc),
!                scm_dc, SCM_ARG1, "client-interface-up");
  
      client_control_smob = (client_control_smob_t *)SCM_SMOB_DATA(scm_dc);
--- 219,223 ----
      /* do assertions */
      SCM_ASSERT(SCM_SMOB_PREDICATE(client_control_tag, scm_dc),
!                scm_dc, SCM_ARG1, "client-get-default-subnet-mask");
  
      client_control_smob = (client_control_smob_t *)SCM_SMOB_DATA(scm_dc);
***************
*** 372,376 ****
  }
  
! SCM scm_client_shutdown(SCM scm_dc)
  {
      client_control_smob_t *client_control_smob;
--- 372,376 ----
  }
  
! SCM dhcp_scm_client_shutdown(SCM scm_dc)
  {
      client_control_smob_t *client_control_smob;
***************
*** 391,395 ****
  }
  
! SCM scm_client_do_discover_icmp_latency(SCM scm_dc)
  {
      client_control_smob_t *client_control_smob;
--- 391,395 ----
  }
  
! SCM dhcp_scm_client_do_discover_icmp_latency(SCM scm_dc)
  {
      client_control_smob_t *client_control_smob;
***************
*** 414,418 ****
  }
  
! SCM scm_client_discover_icmp_latency(SCM scm_dc, SCM scm_address_list)
  {
      client_control_smob_t *client_control_smob;
--- 414,418 ----
  }
  
! SCM dhcp_scm_client_discover_icmp_latency(SCM scm_dc, SCM scm_address_list)
  {
      client_control_smob_t *client_control_smob;
***************
*** 468,472 ****
   * * * * * * * * * * * * * * * * * * * * * * * * * * * * *  */
  
! static SCM scm_client_info_message(SCM string)
  {
      char *str;
--- 468,472 ----
   * * * * * * * * * * * * * * * * * * * * * * * * * * * * *  */
  
! static SCM dhcp_scm_client_info_message(SCM string)
  {
      char *str;
***************
*** 479,483 ****
  }
  
! static SCM scm_client_error_message(SCM string)
  {
      char *str;
--- 479,483 ----
  }
  
! static SCM dhcp_scm_client_error_message(SCM string)
  {
      char *str;
***************
*** 490,494 ****
  }
  
! static SCM scm_client_fatal_error_message(SCM string)
  {
      char *str;
--- 490,494 ----
  }
  
! static SCM dhcp_scm_client_fatal_error_message(SCM string)
  {
      char *str;
***************
*** 785,795 ****
      scm_c_define_gsubr("client-get-default-mtu", 1, 0, 0, dhcp_scm_get_default_mtu);
      scm_c_define_gsubr("client-get-default-subnet-mask", 1, 0, 0, dhcp_scm_get_default_subnet_mask);
!     scm_c_define_gsubr("client-do-discover-icmp-latency?", 1, 0, 0, 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_client_info_message);
!     scm_c_define_gsubr("client-error-message", 1, 0, 0, scm_client_error_message);
!     scm_c_define_gsubr("client-fatal-error-message", 1, 0, 0, scm_client_fatal_error_message);
!     scm_c_define_gsubr("client-shutdown", 1, 0, 0, scm_client_shutdown);
!     scm_c_define_gsubr("client-discover-icmp-latency", 2, 0, 0, scm_client_discover_icmp_latency);
  
      /* create hooks. */
--- 785,795 ----
      scm_c_define_gsubr("client-get-default-mtu", 1, 0, 0, dhcp_scm_get_default_mtu);
      scm_c_define_gsubr("client-get-default-subnet-mask", 1, 0, 0, dhcp_scm_get_default_subnet_mask);
!     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);
  
      /* create hooks. */