1 files changed, 130 insertions, 130 deletions

diff --git a/src/util/test_time.c b/src/util/test_time.c
index 6f4a6332b..b46cac34d 100644
--- a/src/util/test_time.c
+++ b/src/util/test_time.c
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 /**
  * @file util/test_time.c
  * @brief testcase for time.c
@@ -26,7 +26,7 @@
 
 
 int
-main (int argc, char *argv[])
+main(int argc, char *argv[])
 {
   struct GNUNET_TIME_Absolute now;
   struct GNUNET_TIME_AbsoluteNBO nown;
@@ -41,212 +41,212 @@ main (int argc, char *argv[])
   struct GNUNET_TIME_RelativeNBO reln;
   unsigned int i;
 
-  GNUNET_log_setup ("test-time", "WARNING", NULL);
+  GNUNET_log_setup("test-time", "WARNING", NULL);
   forever = GNUNET_TIME_UNIT_FOREVER_ABS;
   relForever = GNUNET_TIME_UNIT_FOREVER_REL;
   relUnit = GNUNET_TIME_UNIT_MILLISECONDS;
   zero.abs_value_us = 0;
 
-  last = now = GNUNET_TIME_absolute_get ();
+  last = now = GNUNET_TIME_absolute_get();
   while (now.abs_value_us == last.abs_value_us)
-    now = GNUNET_TIME_absolute_get ();
-  GNUNET_assert (now.abs_value_us > last.abs_value_us);
+    now = GNUNET_TIME_absolute_get();
+  GNUNET_assert(now.abs_value_us > last.abs_value_us);
 
   /* test overflow checking in multiply */
   rel = GNUNET_TIME_UNIT_MILLISECONDS;
-  GNUNET_log_skip (1, GNUNET_NO);
+  GNUNET_log_skip(1, GNUNET_NO);
   for (i = 0; i < 55; i++)
-    rel = GNUNET_TIME_relative_multiply (rel, 2);
-  GNUNET_log_skip (0, GNUNET_NO);
-  GNUNET_assert (rel.rel_value_us == GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us);
+    rel = GNUNET_TIME_relative_multiply(rel, 2);
+  GNUNET_log_skip(0, GNUNET_NO);
+  GNUNET_assert(rel.rel_value_us == GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us);
   /*check zero */
-  rel.rel_value_us = (UINT64_MAX) - 1024;
-  GNUNET_assert (GNUNET_TIME_UNIT_ZERO.rel_value_us ==
-                 GNUNET_TIME_relative_multiply (rel, 0).rel_value_us);
+  rel.rel_value_us = (UINT64_MAX)-1024;
+  GNUNET_assert(GNUNET_TIME_UNIT_ZERO.rel_value_us ==
+                GNUNET_TIME_relative_multiply(rel, 0).rel_value_us);
 
   /* test infinity-check for relative to absolute */
-  GNUNET_log_skip (1, GNUNET_NO);
-  last = GNUNET_TIME_relative_to_absolute (rel);
-  GNUNET_assert (last.abs_value_us == GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us);
-  GNUNET_log_skip (0, GNUNET_YES);
+  GNUNET_log_skip(1, GNUNET_NO);
+  last = GNUNET_TIME_relative_to_absolute(rel);
+  GNUNET_assert(last.abs_value_us == GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us);
+  GNUNET_log_skip(0, GNUNET_YES);
 
   /* check relative to absolute */
   rel.rel_value_us = 1000000;
-  GNUNET_assert (GNUNET_TIME_absolute_get ().abs_value_us <
-                 GNUNET_TIME_relative_to_absolute (rel).abs_value_us);
+  GNUNET_assert(GNUNET_TIME_absolute_get().abs_value_us <
+                GNUNET_TIME_relative_to_absolute(rel).abs_value_us);
   /*check forever */
   rel.rel_value_us = UINT64_MAX;
-  GNUNET_assert (GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us ==
-                 GNUNET_TIME_relative_to_absolute (rel).abs_value_us);
+  GNUNET_assert(GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us ==
+                GNUNET_TIME_relative_to_absolute(rel).abs_value_us);
   /* check overflow for r2a */
-  rel.rel_value_us = (UINT64_MAX) - 1024;
-  GNUNET_log_skip (1, GNUNET_NO);
-  last = GNUNET_TIME_relative_to_absolute (rel);
-  GNUNET_log_skip (0, GNUNET_NO);
-  GNUNET_assert (last.abs_value_us == GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us);
+  rel.rel_value_us = (UINT64_MAX)-1024;
+  GNUNET_log_skip(1, GNUNET_NO);
+  last = GNUNET_TIME_relative_to_absolute(rel);
+  GNUNET_log_skip(0, GNUNET_NO);
+  GNUNET_assert(last.abs_value_us == GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us);
 
   /* check overflow for relative add */
-  GNUNET_log_skip (1, GNUNET_NO);
-  rel = GNUNET_TIME_relative_add (rel, rel);
-  GNUNET_log_skip (0, GNUNET_NO);
-  GNUNET_assert (rel.rel_value_us == GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us);
+  GNUNET_log_skip(1, GNUNET_NO);
+  rel = GNUNET_TIME_relative_add(rel, rel);
+  GNUNET_log_skip(0, GNUNET_NO);
+  GNUNET_assert(rel.rel_value_us == GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us);
 
-  GNUNET_log_skip (1, GNUNET_NO);
-  rel = GNUNET_TIME_relative_add (relForever, relForever);
-  GNUNET_log_skip (0, GNUNET_NO);
-  GNUNET_assert (rel.rel_value_us == relForever.rel_value_us);
+  GNUNET_log_skip(1, GNUNET_NO);
+  rel = GNUNET_TIME_relative_add(relForever, relForever);
+  GNUNET_log_skip(0, GNUNET_NO);
+  GNUNET_assert(rel.rel_value_us == relForever.rel_value_us);
 
-  GNUNET_log_skip (1, GNUNET_NO);
-  rel = GNUNET_TIME_relative_add (relUnit, relUnit);
-  GNUNET_assert (rel.rel_value_us == 2 * relUnit.rel_value_us);
+  GNUNET_log_skip(1, GNUNET_NO);
+  rel = GNUNET_TIME_relative_add(relUnit, relUnit);
+  GNUNET_assert(rel.rel_value_us == 2 * relUnit.rel_value_us);
 
   /* check relation check in get_duration */
   future.abs_value_us = now.abs_value_us + 1000000;
-  GNUNET_assert (GNUNET_TIME_absolute_get_difference (now, future).rel_value_us ==
-                 1000000);
-  GNUNET_assert (GNUNET_TIME_absolute_get_difference (future, now).rel_value_us ==
-                 0);
+  GNUNET_assert(GNUNET_TIME_absolute_get_difference(now, future).rel_value_us ==
+                1000000);
+  GNUNET_assert(GNUNET_TIME_absolute_get_difference(future, now).rel_value_us ==
+                0);
 
-  GNUNET_assert (GNUNET_TIME_absolute_get_difference (zero, forever).rel_value_us
-                 == forever.abs_value_us);
+  GNUNET_assert(GNUNET_TIME_absolute_get_difference(zero, forever).rel_value_us
+                == forever.abs_value_us);
 
   past.abs_value_us = now.abs_value_us - 1000000;
-  rel = GNUNET_TIME_absolute_get_duration (future);
-  GNUNET_assert (rel.rel_value_us == 0);
-  rel = GNUNET_TIME_absolute_get_duration (past);
-  GNUNET_assert (rel.rel_value_us >= 1000000);
+  rel = GNUNET_TIME_absolute_get_duration(future);
+  GNUNET_assert(rel.rel_value_us == 0);
+  rel = GNUNET_TIME_absolute_get_duration(past);
+  GNUNET_assert(rel.rel_value_us >= 1000000);
 
   /* check get remaining */
-  rel = GNUNET_TIME_absolute_get_remaining (now);
-  GNUNET_assert (rel.rel_value_us == 0);
-  rel = GNUNET_TIME_absolute_get_remaining (past);
-  GNUNET_assert (rel.rel_value_us == 0);
-  rel = GNUNET_TIME_absolute_get_remaining (future);
-  GNUNET_assert (rel.rel_value_us > 0);
-  GNUNET_assert (rel.rel_value_us <= 1000000);
+  rel = GNUNET_TIME_absolute_get_remaining(now);
+  GNUNET_assert(rel.rel_value_us == 0);
+  rel = GNUNET_TIME_absolute_get_remaining(past);
+  GNUNET_assert(rel.rel_value_us == 0);
+  rel = GNUNET_TIME_absolute_get_remaining(future);
+  GNUNET_assert(rel.rel_value_us > 0);
+  GNUNET_assert(rel.rel_value_us <= 1000000);
   forever = GNUNET_TIME_UNIT_FOREVER_ABS;
-  GNUNET_assert (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us ==
-                 GNUNET_TIME_absolute_get_remaining (forever).rel_value_us);
+  GNUNET_assert(GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us ==
+                GNUNET_TIME_absolute_get_remaining(forever).rel_value_us);
 
   /* check endianess */
-  reln = GNUNET_TIME_relative_hton (rel);
-  GNUNET_assert (rel.rel_value_us == GNUNET_TIME_relative_ntoh (reln).rel_value_us);
-  nown = GNUNET_TIME_absolute_hton (now);
-  GNUNET_assert (now.abs_value_us == GNUNET_TIME_absolute_ntoh (nown).abs_value_us);
+  reln = GNUNET_TIME_relative_hton(rel);
+  GNUNET_assert(rel.rel_value_us == GNUNET_TIME_relative_ntoh(reln).rel_value_us);
+  nown = GNUNET_TIME_absolute_hton(now);
+  GNUNET_assert(now.abs_value_us == GNUNET_TIME_absolute_ntoh(nown).abs_value_us);
 
   /* check absolute addition */
-  future = GNUNET_TIME_absolute_add (now, GNUNET_TIME_UNIT_SECONDS);
-  GNUNET_assert (future.abs_value_us == now.abs_value_us + 1000 * 1000LL);
+  future = GNUNET_TIME_absolute_add(now, GNUNET_TIME_UNIT_SECONDS);
+  GNUNET_assert(future.abs_value_us == now.abs_value_us + 1000 * 1000LL);
 
-  future = GNUNET_TIME_absolute_add (forever, GNUNET_TIME_UNIT_ZERO);
-  GNUNET_assert (future.abs_value_us == forever.abs_value_us);
+  future = GNUNET_TIME_absolute_add(forever, GNUNET_TIME_UNIT_ZERO);
+  GNUNET_assert(future.abs_value_us == forever.abs_value_us);
 
-  rel.rel_value_us = (UINT64_MAX) - 1024;
+  rel.rel_value_us = (UINT64_MAX)-1024;
   now.abs_value_us = rel.rel_value_us;
-  future = GNUNET_TIME_absolute_add (now, rel);
-  GNUNET_assert (future.abs_value_us == forever.abs_value_us);
+  future = GNUNET_TIME_absolute_add(now, rel);
+  GNUNET_assert(future.abs_value_us == forever.abs_value_us);
 
   /* check zero */
-  future = GNUNET_TIME_absolute_add (now, GNUNET_TIME_UNIT_ZERO);
-  GNUNET_assert (future.abs_value_us == now.abs_value_us);
+  future = GNUNET_TIME_absolute_add(now, GNUNET_TIME_UNIT_ZERO);
+  GNUNET_assert(future.abs_value_us == now.abs_value_us);
 
-  GNUNET_assert (forever.abs_value_us ==
-                 GNUNET_TIME_absolute_subtract (forever,
-                                                GNUNET_TIME_UNIT_MINUTES).abs_value_us);
+  GNUNET_assert(forever.abs_value_us ==
+                GNUNET_TIME_absolute_subtract(forever,
+                                              GNUNET_TIME_UNIT_MINUTES).abs_value_us);
   /*check absolute subtract */
   now.abs_value_us = 50000;
   rel.rel_value_us = 100000;
-  GNUNET_assert (GNUNET_TIME_UNIT_ZERO_ABS.abs_value_us ==
-                 (GNUNET_TIME_absolute_subtract (now, rel)).abs_value_us);
+  GNUNET_assert(GNUNET_TIME_UNIT_ZERO_ABS.abs_value_us ==
+                (GNUNET_TIME_absolute_subtract(now, rel)).abs_value_us);
   rel.rel_value_us = 10000;
-  GNUNET_assert (40000 == (GNUNET_TIME_absolute_subtract (now, rel)).abs_value_us);
+  GNUNET_assert(40000 == (GNUNET_TIME_absolute_subtract(now, rel)).abs_value_us);
 
   /*check relative divide */
-  GNUNET_assert (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us ==
-                 (GNUNET_TIME_relative_divide (rel, 0)).rel_value_us);
+  GNUNET_assert(GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us ==
+                (GNUNET_TIME_relative_divide(rel, 0)).rel_value_us);
 
   rel = GNUNET_TIME_UNIT_FOREVER_REL;
-  GNUNET_assert (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us ==
-                 (GNUNET_TIME_relative_divide (rel, 2)).rel_value_us);
+  GNUNET_assert(GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us ==
+                (GNUNET_TIME_relative_divide(rel, 2)).rel_value_us);
 
-  rel = GNUNET_TIME_relative_divide (relUnit, 2);
-  GNUNET_assert (rel.rel_value_us == relUnit.rel_value_us / 2);
+  rel = GNUNET_TIME_relative_divide(relUnit, 2);
+  GNUNET_assert(rel.rel_value_us == relUnit.rel_value_us / 2);
 
 
   /* check Return absolute time of 0ms */
   zero = GNUNET_TIME_UNIT_ZERO_ABS;
 
   /* check GNUNET_TIME_calculate_eta */
-  last.abs_value_us = GNUNET_TIME_absolute_get ().abs_value_us - 1024;
+  last.abs_value_us = GNUNET_TIME_absolute_get().abs_value_us - 1024;
   forever = GNUNET_TIME_UNIT_FOREVER_ABS;
   forever.abs_value_us = forever.abs_value_us - 1024;
-  GNUNET_assert (GNUNET_TIME_UNIT_ZERO_ABS.abs_value_us ==
-                 GNUNET_TIME_calculate_eta (forever, 50000, 100000).rel_value_us);
+  GNUNET_assert(GNUNET_TIME_UNIT_ZERO_ABS.abs_value_us ==
+                GNUNET_TIME_calculate_eta(forever, 50000, 100000).rel_value_us);
   /* check zero */
-  GNUNET_log_skip (1, GNUNET_NO);
-  GNUNET_assert (GNUNET_TIME_UNIT_ZERO.rel_value_us ==
-                 (GNUNET_TIME_calculate_eta (last, 60000, 50000)).rel_value_us);
-  GNUNET_log_skip (0, GNUNET_YES);
+  GNUNET_log_skip(1, GNUNET_NO);
+  GNUNET_assert(GNUNET_TIME_UNIT_ZERO.rel_value_us ==
+                (GNUNET_TIME_calculate_eta(last, 60000, 50000)).rel_value_us);
+  GNUNET_log_skip(0, GNUNET_YES);
   /*check forever */
-  GNUNET_assert (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us ==
-                 (GNUNET_TIME_calculate_eta (last, 0, 50000)).rel_value_us);
+  GNUNET_assert(GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us ==
+                (GNUNET_TIME_calculate_eta(last, 0, 50000)).rel_value_us);
 
   /*check relative subtract */
-  now = GNUNET_TIME_absolute_get ();
+  now = GNUNET_TIME_absolute_get();
   rel.rel_value_us = now.abs_value_us;
   relForever.rel_value_us = rel.rel_value_us + 1024;
-  GNUNET_assert (1024 ==
-                 GNUNET_TIME_relative_subtract (relForever, rel).rel_value_us);
+  GNUNET_assert(1024 ==
+                GNUNET_TIME_relative_subtract(relForever, rel).rel_value_us);
   /*check zero */
-  GNUNET_assert (GNUNET_TIME_UNIT_ZERO.rel_value_us ==
-                 GNUNET_TIME_relative_subtract (rel, relForever).rel_value_us);
+  GNUNET_assert(GNUNET_TIME_UNIT_ZERO.rel_value_us ==
+                GNUNET_TIME_relative_subtract(rel, relForever).rel_value_us);
   /*check forever */
   rel.rel_value_us = UINT64_MAX;
-  GNUNET_assert (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us ==
-                 GNUNET_TIME_relative_subtract (rel, relForever).rel_value_us);
+  GNUNET_assert(GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us ==
+                GNUNET_TIME_relative_subtract(rel, relForever).rel_value_us);
 
   /*check GNUNET_TIME_relative_min */
-  now = GNUNET_TIME_absolute_get ();
+  now = GNUNET_TIME_absolute_get();
   rel.rel_value_us = now.abs_value_us;
   relForever.rel_value_us = rel.rel_value_us - 1024;
-  GNUNET_assert (relForever.rel_value_us ==
-                 GNUNET_TIME_relative_min (rel, relForever).rel_value_us);
+  GNUNET_assert(relForever.rel_value_us ==
+                GNUNET_TIME_relative_min(rel, relForever).rel_value_us);
 
   /*check GNUNET_TIME_relative_max */
-  GNUNET_assert (rel.rel_value_us ==
-                 GNUNET_TIME_relative_max (rel, relForever).rel_value_us);
+  GNUNET_assert(rel.rel_value_us ==
+                GNUNET_TIME_relative_max(rel, relForever).rel_value_us);
 
   /*check GNUNET_TIME_absolute_min */
-  now = GNUNET_TIME_absolute_get ();
+  now = GNUNET_TIME_absolute_get();
   last.abs_value_us = now.abs_value_us - 1024;
-  GNUNET_assert (last.abs_value_us ==
-                 GNUNET_TIME_absolute_min (now, last).abs_value_us);
+  GNUNET_assert(last.abs_value_us ==
+                GNUNET_TIME_absolute_min(now, last).abs_value_us);
 
   /*check  GNUNET_TIME_absolute_max */
-  GNUNET_assert (now.abs_value_us ==
-                 GNUNET_TIME_absolute_max (now, last).abs_value_us);
-  for (unsigned int i=0;i<30;i++)
-  {
-    struct GNUNET_CONFIGURATION_Handle *cfg;
-
-    cfg = GNUNET_CONFIGURATION_create ();
-    last = GNUNET_TIME_absolute_get_monotonic (cfg);
-    now = GNUNET_TIME_absolute_get_monotonic (cfg);
-    GNUNET_assert (now.abs_value_us > last.abs_value_us);
-    (void) GNUNET_TIME_absolute_get_monotonic (NULL);
-    GNUNET_CONFIGURATION_set_value_string (cfg,
-                                           "util",
-                                           "MONOTONIC_TIME_FILENAME",
-                                           "monotonic-time.dat");
-    last = GNUNET_TIME_absolute_get_monotonic (cfg);
-    now = GNUNET_TIME_absolute_get_monotonic (cfg);
-    (void) GNUNET_TIME_absolute_get_monotonic (NULL);
-    GNUNET_assert (now.abs_value_us > last.abs_value_us);
-    GNUNET_CONFIGURATION_destroy (cfg);
-  }
-  GNUNET_break (GNUNET_OK ==
-                GNUNET_DISK_directory_remove ("monotonic-time.dat"));
-  
+  GNUNET_assert(now.abs_value_us ==
+                GNUNET_TIME_absolute_max(now, last).abs_value_us);
+  for (unsigned int i = 0; i < 30; i++)
+    {
+      struct GNUNET_CONFIGURATION_Handle *cfg;
+
+      cfg = GNUNET_CONFIGURATION_create();
+      last = GNUNET_TIME_absolute_get_monotonic(cfg);
+      now = GNUNET_TIME_absolute_get_monotonic(cfg);
+      GNUNET_assert(now.abs_value_us > last.abs_value_us);
+      (void)GNUNET_TIME_absolute_get_monotonic(NULL);
+      GNUNET_CONFIGURATION_set_value_string(cfg,
+                                            "util",
+                                            "MONOTONIC_TIME_FILENAME",
+                                            "monotonic-time.dat");
+      last = GNUNET_TIME_absolute_get_monotonic(cfg);
+      now = GNUNET_TIME_absolute_get_monotonic(cfg);
+      (void)GNUNET_TIME_absolute_get_monotonic(NULL);
+      GNUNET_assert(now.abs_value_us > last.abs_value_us);
+      GNUNET_CONFIGURATION_destroy(cfg);
+    }
+  GNUNET_break(GNUNET_OK ==
+               GNUNET_DISK_directory_remove("monotonic-time.dat"));
+
   return 0;
 }