Merge branch '3.0'

2 files changed, 24 insertions, 18 deletions

diff --git a/src/libical/icalrecur.c b/src/libical/icalrecur.c
index 7b6b7adb..437b117f 100644
--- a/src/libical/icalrecur.c
+++ b/src/libical/icalrecur.c
@@ -2412,8 +2412,9 @@ static int expand_by_day(icalrecur_iterator *impl, int year,
             }
         }
 
-        if (doy_offset < 0) this_weekno = 1;
-        else {
+        if (doy_offset < 0) {
+            this_weekno = 1;
+        } else {
             (void)__icaltime_from_day_of_year(impl, day + doy_offset, year,
                                               &this_weekno);
         }
@@ -2437,8 +2438,9 @@ static int expand_by_day(icalrecur_iterator *impl, int year,
                         break;
                     }
                 }
+            } else {
+                valid = 1;
             }
-            else valid = 1;
 
             if (valid) {
                 daysmask_setbit(bydays, day + doy_offset, 1);
@@ -2776,7 +2778,9 @@ static int expand_year_days(icalrecur_iterator *impl, int year)
             for (i = 0; BYWEEKPTR[i] != ICAL_RECURRENCE_ARRAY_MAX; i++) {
                 weekno = BYWEEKPTR[i];
 
-                if (weekno < 0) weekno += nweeks + 1;
+                if (weekno < 0) {
+                    weekno += nweeks + 1;
+                }
 
                 doy = start_doy + 7 * (weekno - 1);
 
@@ -2843,8 +2847,7 @@ static int expand_year_days(icalrecur_iterator *impl, int year)
 
                 first_dow = impl->rule.week_start;
                 last_dow = (first_dow + 6) % 7;
-            }
-            else {
+            } else {
                 /* Get day of week of first day of year */
                 (void)get_day_of_year(impl, year, 1, 1, &first_dow);
 
diff --git a/src/libical/icaltz-util.c b/src/libical/icaltz-util.c
index 43ea1496..bc267766 100644
--- a/src/libical/icaltz-util.c
+++ b/src/libical/icaltz-util.c
@@ -172,7 +172,7 @@ static long long int decode64(const void *ptr)
     if ((BYTE_ORDER == BIG_ENDIAN)) {
         return *(const long long int *)ptr;
     } else {
-        return (int)bswap_64(*(const long long int *)ptr);
+        return (int)bswap_64(*(const unsigned long long int *)ptr);
     }
 #endif
 }
@@ -353,8 +353,9 @@ icalcomponent *icaltzutil_fetch_timezone(const char *location)
         break;
     case '2':
     case '3':
-        if (sizeof(time_t) == 8)
+        if (sizeof(time_t) == 8) {
             trans_size = 8;
+        }
         break;
     default:
         icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
@@ -369,11 +370,11 @@ icalcomponent *icaltzutil_fetch_timezone(const char *location)
     num_types = (size_t)decode(header.typecnt);
 
     if (trans_size == 8) {
-        long skip = num_trans * 5 + num_types * 6 +
+        size_t skip = num_trans * 5 + num_types * 6 +
             num_chars + num_leaps * 8 + num_isstd + num_isgmt;
-            
+
         /* skip version 1 data block */
-        if (fseek(f, skip, SEEK_CUR) != 0) {
+        if (fseek(f, (long)skip, SEEK_CUR) != 0) {
             icalerror_set_errno(ICAL_FILE_ERROR);
             goto error;
         }
@@ -400,7 +401,7 @@ icalcomponent *icaltzutil_fetch_timezone(const char *location)
             icalerror_set_errno(ICAL_NEWFAILED_ERROR);
             goto error;
         }
-        r_trans = calloc(num_trans, trans_size);
+        r_trans = calloc(num_trans, (size_t)trans_size);
         if (r_trans == NULL) {
             icalerror_set_errno(ICAL_NEWFAILED_ERROR);
             goto error;
@@ -409,7 +410,7 @@ icalcomponent *icaltzutil_fetch_timezone(const char *location)
         icalerror_set_errno(ICAL_FILE_ERROR);
         goto error;
     }
-    EFREAD(r_trans, trans_size, num_trans, f);
+    EFREAD(r_trans, (size_t)trans_size, num_trans, f);
     temp = r_trans;
     if (num_trans) {
         trans_idx = calloc(num_trans, sizeof(int));
@@ -419,10 +420,11 @@ icalcomponent *icaltzutil_fetch_timezone(const char *location)
         }
         for (i = 0; i < num_trans; i++) {
             trans_idx[i] = fgetc(f);
-            if (trans_size == 8)
+            if (trans_size == 8) {
                 transitions[i] = (time_t) decode64(r_trans);
-            else
+            } else {
                 transitions[i] = (time_t) decode(r_trans);
+            }
             r_trans += trans_size;
         }
     }
@@ -464,11 +466,12 @@ icalcomponent *icaltzutil_fetch_timezone(const char *location)
     for (i = 0; i < num_leaps; i++) {
         char c[8];
 
-        EFREAD(c, trans_size, 1, f);
-        if (trans_size == 8)
+        EFREAD(c, (size_t)trans_size, 1, f);
+        if (trans_size == 8) {
             leaps[i].transition = (time_t)decode64(c);
-        else
+        } else {
             leaps[i].transition = (time_t)decode(c);
+        }
 
         EFREAD(c, 4, 1, f);
         leaps[i].change = decode(c);