From: Masatake YAMATO <yamato@redhat.com>
Date: Sat, 10 Jun 2023 15:31:46 +0000 (+0900)
Subject: timeutils: add an inline funciton, is_timespecset()
X-Git-Tag: v2.40-rc1~397^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=765b4a147b023725bc3e2dda2075e1dcb4eb655f;p=thirdparty%2Futil-linux.git

timeutils: add an inline funciton, is_timespecset()

Close #2300.

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
---

diff --git a/include/timeutils.h b/include/timeutils.h
index eb0e534510..9c99ef5a75 100644
--- a/include/timeutils.h
+++ b/include/timeutils.h
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <inttypes.h>
 #include <sys/time.h>
+#include <stdbool.h>
 
 typedef uint64_t usec_t;
 typedef uint64_t nsec_t;
@@ -111,4 +112,9 @@ static inline struct timeval usec_to_timeval(usec_t t)
 	return r;
 }
 
+static inline bool is_timespecset(const struct timespec *t)
+{
+	return t->tv_sec || t->tv_nsec;
+}
+
 #endif /* UTIL_LINUX_TIME_UTIL_H */
diff --git a/misc-utils/lsfd-unkn.c b/misc-utils/lsfd-unkn.c
index 9af0816f11..c42beb71c1 100644
--- a/misc-utils/lsfd-unkn.c
+++ b/misc-utils/lsfd-unkn.c
@@ -22,6 +22,7 @@
 #include "xalloc.h"
 #include "nls.h"
 #include "libsmartcols.h"
+#include "timeutils.h"
 
 #include "lsfd.h"
 
@@ -616,11 +617,6 @@ static int anon_timerfd_handle_fdinfo(struct unkn *unkn, const char *key, const
 	}
 }
 
-static bool is_zero_timespec(const struct timespec *t)
-{
-	return !t->tv_sec && !t->tv_nsec;
-}
-
 static const char *anon_timerfd_decode_clockid(int clockid)
 {
 	switch (clockid) {
@@ -663,12 +659,12 @@ static char *anon_timerfd_get_name(struct unkn *unkn)
 	clockid_name = anon_timerfd_decode_clockid(data->clockid);
 
 	exp = &data->itimerspec.it_value;
-	if (!is_zero_timespec(exp))
+	if (is_timespecset(exp))
 		anon_timerfd_render_timespec_string(exp_buf, sizeof(exp_buf),
 						    " remaining=", exp);
 
 	ival = &data->itimerspec.it_interval;
-	if (!is_zero_timespec(ival))
+	if (is_timespecset(ival))
 		anon_timerfd_render_timespec_string(ival_buf, sizeof(ival_buf),
 						    " interval=", ival);