X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdaemon%2Futils_time_test.c;h=e9db187e77403c5e921ccdc027d8f8dbdd38e264;hb=4d86011a91b7fe05fd5f4d84fa88c19d8c031110;hp=4d64991b94a4652e59b22c999a6ca96a366fc258;hpb=6a1a62048b6d0d2ddf5c17295609d3ebf010f40b;p=collectd.git

diff --git a/src/daemon/utils_time_test.c b/src/daemon/utils_time_test.c
index 4d64991b..e9db187e 100644
--- a/src/daemon/utils_time_test.c
+++ b/src/daemon/utils_time_test.c
@@ -27,6 +27,7 @@
 #define DBL_PRECISION 1e-3
 
 #include "collectd.h"
+
 #include "testing.h"
 #include "utils_time.h"
 
@@ -64,12 +65,8 @@ DEF_TEST(conversion)
     // 1546167986577716567 / 2^30 = 1439981150.0475896215...
     {1546167986577716567ULL, 1439981150.048, 1439981150, 1439981150048ULL, {1439981150,  47590}, {1439981150,  47589622}},
   };
-  size_t i;
-
-  for (i = 0; i < (sizeof (cases) / sizeof (cases[0])); i++) {
-    struct timeval tv;
-    struct timespec ts;
 
+  for (size_t i = 0; i < (sizeof (cases) / sizeof (cases[0])); i++) {
     // cdtime -> s
     EXPECT_EQ_UINT64 (cases[i].tt, CDTIME_T_TO_TIME_T (cases[i].t));
 
@@ -77,12 +74,12 @@ DEF_TEST(conversion)
     EXPECT_EQ_UINT64(cases[i].ms, CDTIME_T_TO_MS (cases[i].t));
 
     // cdtime -> us
-    CDTIME_T_TO_TIMEVAL (cases[i].t, &tv);
+    struct timeval tv = CDTIME_T_TO_TIMEVAL (cases[i].t);
     EXPECT_EQ_UINT64 (cases[i].tv.tv_sec, tv.tv_sec);
     EXPECT_EQ_UINT64 (cases[i].tv.tv_usec, tv.tv_usec);
 
     // cdtime -> ns
-    CDTIME_T_TO_TIMESPEC (cases[i].t, &ts);
+    struct timespec ts = CDTIME_T_TO_TIMESPEC (cases[i].t);
     EXPECT_EQ_UINT64 (cases[i].ts.tv_sec, ts.tv_sec);
     EXPECT_EQ_UINT64 (cases[i].ts.tv_nsec, ts.tv_nsec);
 
@@ -107,9 +104,8 @@ DEF_TEST(ns_to_cdtime)
     // 1439981880053705608 * 2^30 / 10^9 = 1546168770415815077.4
     {1439981880053705608ULL, 1546168770415815077ULL},
   };
-  size_t i;
 
-  for (i = 0; i < (sizeof (cases) / sizeof (cases[0])); i++) {
+  for (size_t i = 0; i < (sizeof (cases) / sizeof (cases[0])); i++) {
     EXPECT_EQ_UINT64 (cases[i].want, NS_TO_CDTIME_T (cases[i].ns));
   }