From 68d23225a38a35f1325eb39fa4ed5a005d5de473 Mon Sep 17 00:00:00 2001
From: fujuntang <fujuntang@aiot.com>
Date: 星期三, 11 八月 2021 09:50:20 +0800
Subject: [PATCH] fix from 3.1 first commit
---
src/time_util.cpp | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/time_util.cpp b/src/time_util.cpp
index f00b4f4..577d1b0 100644
--- a/src/time_util.cpp
+++ b/src/time_util.cpp
@@ -6,12 +6,12 @@
struct timespec TimeUtil::calc_abs_time(const struct timespec *ts) {
struct timespec res;
- struct timespec timeout;
- if (clock_gettime(CLOCK_REALTIME, &timeout) == -1)
+ struct timespec cur;
+ if (clock_gettime(CLOCK_REALTIME, &cur) == -1)
err_exit(errno, "clock_gettime");
- res.tv_sec = timeout.tv_sec + ts->tv_sec;
- res.tv_nsec = timeout.tv_nsec + ts->tv_nsec;
+ res.tv_sec = cur.tv_sec + ts->tv_sec;
+ res.tv_nsec = cur.tv_nsec + ts->tv_nsec;
res.tv_sec = res.tv_sec + floor(res.tv_nsec / NANO);
res.tv_nsec = res.tv_nsec % NANO;
return res;
--
Gitblit v1.8.0