From 0b52aa9d137b03017313e028accc92dc5d536440 Mon Sep 17 00:00:00 2001 From: Erik Reider <35975961+ErikReider@users.noreply.github.com> Date: Sat, 30 Dec 2023 11:25:16 +0100 Subject: Initial rebase without effects --- util/env.c | 2 +- util/time.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'util') diff --git a/util/env.c b/util/env.c index b0a9efd..77911a2 100644 --- a/util/env.c +++ b/util/env.c @@ -19,7 +19,7 @@ bool env_parse_bool(const char *option) { return false; } -ssize_t env_parse_switch(const char *option, const char **switches) { +size_t env_parse_switch(const char *option, const char **switches) { const char *env = getenv(option); if (env) { wlr_log(WLR_INFO, "Loading %s option: %s", option, env); diff --git a/util/time.c b/util/time.c index 06e42b4..78faac5 100644 --- a/util/time.c +++ b/util/time.c @@ -10,12 +10,16 @@ int64_t timespec_to_msec(const struct timespec *a) { return (int64_t)a->tv_sec * 1000 + a->tv_nsec / 1000000; } +int64_t timespec_to_nsec(const struct timespec *a) { + return (int64_t)a->tv_sec * NSEC_PER_SEC + a->tv_nsec; +} + void timespec_from_nsec(struct timespec *r, int64_t nsec) { r->tv_sec = nsec / NSEC_PER_SEC; r->tv_nsec = nsec % NSEC_PER_SEC; } -uint32_t get_current_time_msec(void) { +int64_t get_current_time_msec(void) { struct timespec now; clock_gettime(CLOCK_MONOTONIC, &now); return timespec_to_msec(&now); -- cgit v1.2.3