picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Simplify the if cases for timezone checking

Browse source 
Just to reduce the indentation a bit.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-09-17 09:10:03 +02:00
parent 48d26c0164
commit a2932a0d1a
2 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/basic/calendarspec.c
View file

@ -928,19 +928,16 @@ int calendar_spec_from_string(const char *p, CalendarSpec **spec) {
c->dst = j;
} else {
const char *last_space;
last_space = strrchr(p, ' ');
if (last_space != NULL) {
const char *timezone = last_space + 1;
if (timezone_is_valid(timezone)) {
c->timezone = strdup(timezone);
if (!c->timezone) {
r = -ENOMEM;
goto fail;
}
p = strndupa(p, last_space - p);
if (last_space != NULL && timezone_is_valid(last_space + 1)) {
c->timezone = strdup(last_space + 1);
if (!c->timezone) {
r = -ENOMEM;
goto fail;
}
p = strndupa(p, last_space - p);
}
}
}

8
src/basic/time-util.c
View file

@ -891,12 +891,8 @@ int parse_timestamp(const char *t, usec_t *usec) {
pid_t pid;
last_space = strrchr(t, ' ');
if (last_space != NULL) {
if (timezone_is_valid(last_space + 1)) {
timezone = last_space + 1;
}
}
if (last_space != NULL && timezone_is_valid(last_space + 1))
timezone = last_space + 1;
if (timezone == NULL || endswith_no_case(t, " UTC"))
return parse_timestamp_impl(t, usec, false);