summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllen Winter <allen.winter@kdab.com>2020-11-15 11:53:35 -0500
committerAllen Winter <allen.winter@kdab.com>2020-11-15 11:53:35 -0500
commit5df6fed91064a4c969dbb89a7a54e245db2c3342 (patch)
tree3ea7dc1b792ebb3c6d58bde7939fe3c7913c443c
parent371a574b352abd08078e4424b3d5c7483fbb6898 (diff)
downloadlibical-git-5df6fed91064a4c969dbb89a7a54e245db2c3342.tar.gz
icalrecur.c, icaltz-util.c - coding style
-rw-r--r--src/libical/icalrecur.c15
-rw-r--r--src/libical/icaltz-util.c13
2 files changed, 17 insertions, 11 deletions
diff --git a/src/libical/icalrecur.c b/src/libical/icalrecur.c
index 1c46091a..746a54c6 100644
--- a/src/libical/icalrecur.c
+++ b/src/libical/icalrecur.c
@@ -2329,8 +2329,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);
}
@@ -2354,8 +2355,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);
@@ -2625,7 +2627,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);
@@ -2692,8 +2696,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 38cc1366..181317d0 100644
--- a/src/libical/icaltz-util.c
+++ b/src/libical/icaltz-util.c
@@ -328,8 +328,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);
@@ -394,10 +395,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;
}
}
@@ -440,10 +442,11 @@ icalcomponent *icaltzutil_fetch_timezone(const char *location)
char c[8];
EFREAD(c, (size_t)trans_size, 1, f);
- if (trans_size == 8)
+ 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);