From 4f8536876a7fefbe422cbfae6d45bb3efc69db04 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Fri, 3 Aug 2018 02:06:43 +0200 Subject: [PATCH] Always use clock drivers with a valid instance --- src/lib/time.c | 5 ++++- tools/clock.c | 5 ++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/lib/time.c b/src/lib/time.c index 1da13cd..e43698c 100644 --- a/src/lib/time.c +++ b/src/lib/time.c @@ -13,9 +13,12 @@ /* time */ time_t time(time_t * time) { + ukClock * clock; time_t t; - if(clock_get_time(NULL, &t) != 0) + if((clock = clock_get_default()) == NULL) + return -1; + if(clock_get_time(clock, &t) != 0) return -1; if(time != NULL) *time = t; diff --git a/tools/clock.c b/tools/clock.c index 6d856bf..ab9e5e7 100644 --- a/tools/clock.c +++ b/tools/clock.c @@ -64,10 +64,9 @@ ukClock * clock_get_default(void) /* clock_get_time */ int clock_get_time(ukClock * clock, time_t * time) { - if(clock == NULL - && (clock = clock_get_default()) == NULL) + if(clock->get_time == NULL) { - errno = ENODEV; + errno = ENOTSUP; return -1; } return clock->get_time(clock, time);