diff options
author | Lennart Poettering <lennart@poettering.net> | 2015-08-17 11:30:31 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2015-08-17 11:30:31 +0200 |
commit | aaa2a3abf9b3f027918b60fe0d0340fcd4874291 (patch) | |
tree | 20ffef498556100193946c2bc6c5f6da51a4166d /src/core | |
parent | 22175a39e8df964b26def7988b841b348de9c97a (diff) | |
parent | 3e044c492e3ebe64f4e3175c94f9db8a62557b82 (diff) |
Merge pull request #976 from elfring/Remove_unnecessary_checks2
Delete unnecessary checks before some function calls
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/dbus-timer.c | 3 | ||||
-rw-r--r-- | src/core/timer.c | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c index 74a9914358..8ea2cf84a4 100644 --- a/src/core/dbus-timer.c +++ b/src/core/dbus-timer.c @@ -252,8 +252,7 @@ static int bus_timer_set_transient_property( v = new0(TimerValue, 1); if (!v) { - if (c) - calendar_spec_free(c); + calendar_spec_free(c); return -ENOMEM; } diff --git a/src/core/timer.c b/src/core/timer.c index 51cd56ca84..7027f83dfd 100644 --- a/src/core/timer.c +++ b/src/core/timer.c @@ -56,10 +56,7 @@ void timer_free_values(Timer *t) { while ((v = t->values)) { LIST_REMOVE(value, t->values, v); - - if (v->calendar_spec) - calendar_spec_free(v->calendar_spec); - + calendar_spec_free(v->calendar_spec); free(v); } } |