shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-04 17:47:03 +03:00
Code

calendarspec: use structured initializers

Browse Source
This commit is contained in:
Yu Watanabe 2019-04-08 00:18:54 +09:00
parent 1eacc47062
commit 4122b14b3a
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/shared/calendarspec.c
View File

@ -551,14 +551,16 @@ static int const_chain(int value, CalendarComponent **c) {
assert(c);
cc = new0(CalendarComponent, 1);
cc = new(CalendarComponent, 1);
if (!cc)
return -ENOMEM;
cc->start = value;
cc->stop = -1;
cc->repeat = 0;
cc->next = *c;
*cc = (CalendarComponent) {
.start = value,
.stop = -1,
.repeat = 0,
.next = *c,
};
*c = cc;
@ -644,14 +646,16 @@ static int prepend_component(const char **p, bool usec, unsigned nesting, Calend
if (!IN_SET(*e, 0, ' ', ',', '-', '~', ':'))
return -EINVAL;
cc = new0(CalendarComponent, 1);
cc = new(CalendarComponent, 1);
if (!cc)
return -ENOMEM;
cc->start = start;
cc->stop = stop;
cc->repeat = repeat;
cc->next = *c;
*cc = (CalendarComponent) {
.start = start,
.stop = stop,
.repeat = repeat,
.next = *c,
};
*p = e;
*c = cc;
@ -888,11 +892,14 @@ int calendar_spec_from_string(const char *p, CalendarSpec **spec) {
assert(p);
assert(spec);
c = new0(CalendarSpec, 1);
c = new(CalendarSpec, 1);
if (!c)
return -ENOMEM;
c->dst = -1;
c->timezone = NULL;
*c = (CalendarSpec) {
.dst = -1,
.timezone = NULL,
};
utc = endswith_no_case(p, " UTC");
if (utc) {