diff options
author | Allen Winter <allen.winter@kdab.com> | 2019-06-30 12:45:17 -0400 |
---|---|---|
committer | Allen Winter <allen.winter@kdab.com> | 2019-07-13 16:28:14 -0400 |
commit | 7453fdab7651e12c7c5de1c17c3f3bd4a36a328d (patch) | |
tree | a194a945448339f2f595c91199fc9bb39a0d446e | |
parent | 2a3d8035a09f174fc136e482feca5931499742df (diff) | |
download | libical-git-7453fdab7651e12c7c5de1c17c3f3bd4a36a328d.tar.gz |
src/libical/icaltimezone.c - minor coding style
-rw-r--r-- | src/libical/icaltimezone.c | 44 |
1 files changed, 24 insertions, 20 deletions
diff --git a/src/libical/icaltimezone.c b/src/libical/icaltimezone.c index 382b8a20..fe59cb4c 100644 --- a/src/libical/icaltimezone.c +++ b/src/libical/icaltimezone.c @@ -2290,12 +2290,13 @@ void icaltimezone_truncate_vtimezone(icalcomponent *vtz, r = icaltime_compare(obs.onset, start); if (r < 0) { /* DTSTART is prior to our window open - check it vs tombstone */ - if (need_tomb) check_tombstone(&tombstone, &obs); + if (need_tomb) { + check_tombstone(&tombstone, &obs); + } /* Adjust it */ trunc_dtstart = 1; - } - else if (r == 0) { + } else if (r == 0) { /* DTSTART is on/after our window open */ need_tomb = 0; } @@ -2311,13 +2312,14 @@ void icaltimezone_truncate_vtimezone(icalcomponent *vtz, /* RRULE ends prior to our window open - check UNTIL vs tombstone */ obs.onset = rrule.until; - if (need_tomb) check_tombstone(&tombstone, &obs); + if (need_tomb) { + check_tombstone(&tombstone, &obs); + } /* Remove RRULE */ icalcomponent_remove_property(comp, rrule_prop); icalproperty_free(rrule_prop); - } - else { + } else { /* RRULE ends on/after our window open */ if (need_tzuntil && (eternal || icaltime_compare(rrule.until, end) >= 0)) { @@ -2377,8 +2379,7 @@ void icaltimezone_truncate_vtimezone(icalcomponent *vtz, prop = icalproperty_new_rdate(rdate); icalcomponent_add_property(comp, prop); } - } - else { + } else { /* Set UNTIL to previous onset */ rrule.until = prev_onset; icalproperty_set_rrule(rrule_prop, rrule); @@ -2406,9 +2407,10 @@ void icaltimezone_truncate_vtimezone(icalcomponent *vtz, proleptic_prop = NULL; } } - if (need_tomb) check_tombstone(&tombstone, &obs); - } - else { + if (need_tomb) { + check_tombstone(&tombstone, &obs); + } + } else { /* Observance is on/after our window open */ if (r == 0) need_tomb = 0; @@ -2445,8 +2447,7 @@ void icaltimezone_truncate_vtimezone(icalcomponent *vtz, /* Check if observance is outside 1yr of window close */ ydiff = end.year - recur.year; if (ydiff > 1) { - /* Bump RRULE to restart at - 1 year prior to our window close */ + /* Bump RRULE to restart at 1 year prior to our window close */ icaltimetype newstart = recur; newstart.year = end.year - 1; newstart.month = end.month; @@ -2499,13 +2500,14 @@ void icaltimezone_truncate_vtimezone(icalcomponent *vtz, r = icaltime_compare(obs.onset, start); if (r < 0) { /* RDATE is prior to window open - check it vs tombstone */ - if (need_tomb) check_tombstone(&tombstone, &obs); + if (need_tomb) { + check_tombstone(&tombstone, &obs); + } /* Remove it */ icalcomponent_remove_property(comp, rdate->prop); icalproperty_free(rdate->prop); - } - else { + } else { /* RDATE is on/after our window open */ if (r == 0) need_tomb = 0; @@ -2554,8 +2556,7 @@ void icaltimezone_truncate_vtimezone(icalcomponent *vtz, if (tombstone.onset.is_daylight) { tomb = tomb_day; tomb_day = NULL; - } - else { + } else { tomb = tomb_std; tomb_std = NULL; } @@ -2611,7 +2612,10 @@ void icaltimezone_truncate_vtimezone(icalcomponent *vtz, /* Add TZUNTIL to VTIMEZONE */ prop = icalcomponent_get_first_property(vtz, ICAL_TZUNTIL_PROPERTY); - if (prop) icalproperty_set_tzuntil(prop, end); - else icalcomponent_add_property(vtz, icalproperty_new_tzuntil(end)); + if (prop) { + icalproperty_set_tzuntil(prop, end); + } else { + icalcomponent_add_property(vtz, icalproperty_new_tzuntil(end)); + } } } |