[FA-commits] libical/src/libical icaltime.c,1.40,1.41 icalcomponent.c,1.40,1.41

[<li...@us...>]

Update of /cvsroot/freeassociation/libical/src/libical
In directory usw-pr-cvs1:/tmp/cvs-serv26456

Modified Files:
	icaltime.c icalcomponent.c 
Log Message:
proper icaltime_compare()

Index: icaltime.c
===================================================================
RCS file: /cvsroot/freeassociation/libical/src/libical/icaltime.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- icaltime.c	8 Aug 2002 16:44:36 -0000	1.40
+++ icaltime.c	9 Aug 2002 14:45:12 -0000	1.41
@@ -732,24 +732,13 @@
  * 	timezone.
  */
 
-int icaltime_compare_with_zone(const struct icaltimetype a, const struct icaltimetype b) 
+int icaltime_compare(const struct icaltimetype a, const struct icaltimetype b) 
 {
-    struct icaltimetype a_utc, b_utc;
-    a_utc = icaltime_convert_to_zone(a, icaltimezone_get_utc_timezone());
-    b_utc = icaltime_convert_to_zone(b, icaltimezone_get_utc_timezone());
+    int retval;
 
-    return (icaltime_compare(a_utc, b_utc));
-}
+    a = icaltime_convert_to_zone(a, icaltimezone_get_utc_timezone());
+    b = icaltime_convert_to_zone(b, icaltimezone_get_utc_timezone());
 
-/**
- *	Return -1, 0, or 1 to indicate that a<b, a==b or a>b.
- *
- *	@todo This is completely broken unless both times happen to be in
- *	the same timezone, or both floating.
- */
-int icaltime_compare(const struct icaltimetype a, const struct icaltimetype b)
-{
-    int retval;
 
     if (a.year > b.year)
 	retval = 1;
@@ -794,6 +783,9 @@
 icaltime_compare_date_only(const struct icaltimetype a, const struct icaltimetype b)
 {
     int retval;
+
+    a = icaltime_convert_to_zone(a, icaltimezone_get_utc_timezone());
+    b = icaltime_convert_to_zone(b, icaltimezone_get_utc_timezone());
 
     if (a.year > b.year)
 	retval = 1;

Index: icalcomponent.c
===================================================================
RCS file: /cvsroot/freeassociation/libical/src/libical/icalcomponent.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- icalcomponent.c	8 Aug 2002 16:46:39 -0000	1.40
+++ icalcomponent.c	9 Aug 2002 14:45:12 -0000	1.41
@@ -861,7 +861,7 @@
 	 
     struct icaltimetype exdatetime = icalproperty_get_exdate(exdate);
 
-    if (icaltime_compare_with_zone(*recurtime, exdatetime) == 0) {
+    if (icaltime_compare(*recurtime, exdatetime) == 0) {
       /** MATCHED **/
       return 1;
     }
@@ -883,7 +883,7 @@
       if (icaltime_is_null_time(exrule_time))
 	break;
 
-      result = icaltime_compare_with_zone(*recurtime, exrule_time);
+      result = icaltime_compare(*recurtime, exrule_time);
       if (result == 0) {
 	icalrecur_iterator_free(exrule_itr);
 	return 1; /** MATCH **/