[dhcp-agent-commits] dhcp-agent/src dhcp-lease-guile.c,1.2,1.3

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

Update of /cvsroot/dhcp-agent/dhcp-agent/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11044/src

Modified Files:
	dhcp-lease-guile.c 
Log Message:
various fixes. still not thoroughly tested

Index: dhcp-lease-guile.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-lease-guile.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dhcp-lease-guile.c	17 Aug 2003 00:57:57 -0000	1.2
--- dhcp-lease-guile.c	2 Jun 2004 01:57:28 -0000	1.3
***************
*** 524,528 ****
  
      lease_def_smob = (lease_definition_smob_t *)SCM_SMOB_DATA(scm_lease_def);
!     return SCM_MAKINUM(lease_definition_get_bottom_addr(lease_def_smob->lease_def));
  }
  
--- 524,539 ----
  
      lease_def_smob = (lease_definition_smob_t *)SCM_SMOB_DATA(scm_lease_def);
!     return scm_ulong2num(lease_definition_get_bottom_addr(lease_def_smob->lease_def));
! }
! 
! static SCM scm_lease_def_get_addr(SCM scm_lease_def)
! {
!     lease_definition_smob_t *lease_def_smob;
! 
!     SCM_ASSERT(SCM_SMOB_PREDICATE(lease_def_tag, scm_lease_def),
!                scm_lease_def, SCM_ARG1, "lease-def-get-bottom-addr");
! 
!     lease_def_smob = (lease_definition_smob_t *)SCM_SMOB_DATA(scm_lease_def);
!     return scm_ulong2num(lease_definition_get_addr(lease_def_smob->lease_def));
  }
  
***************
*** 536,540 ****
  
      lease_def_smob = (lease_definition_smob_t *)SCM_SMOB_DATA(scm_lease_def);
!     return SCM_MAKINUM(lease_definition_get_top_addr(lease_def_smob->lease_def));
  }
  
--- 547,551 ----
  
      lease_def_smob = (lease_definition_smob_t *)SCM_SMOB_DATA(scm_lease_def);
!     return scm_ulong2num(lease_definition_get_top_addr(lease_def_smob->lease_def));
  }
  
***************
*** 548,552 ****
  
      lease_def_smob = (lease_definition_smob_t *)SCM_SMOB_DATA(scm_lease_def);
!     return SCM_MAKINUM(lease_definition_get_subnet_addr(lease_def_smob->lease_def));
  }
  
--- 559,563 ----
  
      lease_def_smob = (lease_definition_smob_t *)SCM_SMOB_DATA(scm_lease_def);
!     return scm_ulong2num(lease_definition_get_subnet_addr(lease_def_smob->lease_def));
  }
  
***************
*** 560,564 ****
  
      lease_def_smob = (lease_definition_smob_t *)SCM_SMOB_DATA(scm_lease_def);
!     return SCM_MAKINUM(lease_definition_get_subnet_mask(lease_def_smob->lease_def));
  }
  
--- 571,575 ----
  
      lease_def_smob = (lease_definition_smob_t *)SCM_SMOB_DATA(scm_lease_def);
!     return scm_ulong2num(lease_definition_get_subnet_mask(lease_def_smob->lease_def));
  }
  
***************
*** 625,628 ****
--- 636,640 ----
      scm_c_define_gsubr("lease-def-get-bottom-addr", 1, 0, 0, scm_lease_def_get_bottom_addr);
      scm_c_define_gsubr("lease-def-get-top-addr", 1, 0, 0, scm_lease_def_get_top_addr);
+     scm_c_define_gsubr("lease-def-get-addr", 1, 0, 0, scm_lease_def_get_addr);
      scm_c_define_gsubr("lease-def-get-subnet-addr", 1, 0, 0, scm_lease_def_get_subnet_addr);
      scm_c_define_gsubr("lease-def-get-subnet-mask", 1, 0, 0, scm_lease_def_get_subnet_mask);
***************
*** 722,726 ****
  
      SCM_ASSERT(SCM_SMOB_PREDICATE(lease_constraint_tag, scm_lease_constraint),
!                scm_lease_constraint, SCM_ARG1, "lease-constraint-get-type");
  
      lease_constraint_smob = (lease_constraint_smob_t *)SCM_SMOB_DATA(scm_lease_constraint);
--- 734,738 ----
  
      SCM_ASSERT(SCM_SMOB_PREDICATE(lease_constraint_tag, scm_lease_constraint),
!                scm_lease_constraint, SCM_ARG1, "lease-constraint-get-hostname");
  
      lease_constraint_smob = (lease_constraint_smob_t *)SCM_SMOB_DATA(scm_lease_constraint);
***************
*** 742,746 ****
  
      SCM_ASSERT(SCM_SMOB_PREDICATE(lease_constraint_tag, scm_lease_constraint),
!                scm_lease_constraint, SCM_ARG1, "lease-constraint-get-type");
  
      lease_constraint_smob = (lease_constraint_smob_t *)SCM_SMOB_DATA(scm_lease_constraint);
--- 754,758 ----
  
      SCM_ASSERT(SCM_SMOB_PREDICATE(lease_constraint_tag, scm_lease_constraint),
!                scm_lease_constraint, SCM_ARG1, "lease-constraint-get-hw-address");
  
      lease_constraint_smob = (lease_constraint_smob_t *)SCM_SMOB_DATA(scm_lease_constraint);