libical r655 - in branches/gnome-2-22: . src/libical src/test

[pchen svn gnome org]

Author: pchen
Date: Sun Sep 14 07:32:52 2008
New Revision: 655
URL: http://svn.gnome.org/viewvc/libical?rev=655&view=rev

Log:
Fixes an issue with casablanca timezone.



Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/src/libical/icaltz-util.c
   branches/gnome-2-22/src/test/timezones.c

Modified: branches/gnome-2-22/src/libical/icaltz-util.c
==============================================================================
--- branches/gnome-2-22/src/libical/icaltz-util.c	(original)
+++ branches/gnome-2-22/src/libical/icaltz-util.c	Sun Sep 14 07:32:52 2008
@@ -155,18 +155,15 @@
 	idx = trans_idx [i];
 	types [idx].isdst ? (*dstidx = i) : (*stdidx = i);
 	
-	if (i >= num_trans - 1) 
-		i--;
-	else 
+	if (i < num_trans - 1) 
 		i++;
+	else 
+		return;
 
 	idx = trans_idx [i];
 	types [idx].isdst ? (*dstidx = i) : (*stdidx = i);
 
-	if (*dstidx != -1 && *stdidx != -1)
-		return;
-	else 
-		icalerror_set_errno (ICAL_MALFORMEDDATA_ERROR);
+	return;
 }
 
 

Modified: branches/gnome-2-22/src/test/timezones.c
==============================================================================
--- branches/gnome-2-22/src/test/timezones.c	(original)
+++ branches/gnome-2-22/src/test/timezones.c	Sun Sep 14 07:32:52 2008
@@ -87,7 +87,7 @@
 
             /* only print first failed day and first day which is okay again */
             if (verbose || curr_failed != failed) {
-                printf("%s: day %03d: %s: libc %04d-%02d-%02d %02d:%02d:%02d",
+                printf("%s: day %03d: %s: libc %04d-%02d-%02d %02d:%02d:%02d dst %d",
                        zone_location,
                        day,
                        verbose ?
@@ -99,15 +99,17 @@
                        curr_tm.tm_mday,
                        curr_tm.tm_hour,
                        curr_tm.tm_min,
-                       curr_tm.tm_sec);
+                       curr_tm.tm_sec,
+		       curr_tm.tm_isdst);
                 if (curr_failed) {
-                    printf(" != libical %04d-%02d-%02d %02d:%02d:%02d",
+                    printf(" != libical %04d-%02d-%02d %02d:%02d:%02d dst %d",
                            curr_tt.year,
                            curr_tt.month,
                            curr_tt.day,
                            curr_tt.hour,
                            curr_tt.minute,
-                           curr_tt.second);
+                           curr_tt.second,
+			   curr_tt.is_daylight);
                     ret = 1;
                 }
                 printf("\n");