From 783b5abb617929fe2860446e4bfad07a614723ff Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Fri, 6 Sep 2019 10:56:25 +0000
Subject:  Adapt to new stopwatch API

---
 src/s6-rc/s6-rc-dryrun.c          | 3 +--
 src/s6-rc/s6-rc-fdholder-filler.c | 3 +--
 src/s6-rc/s6-rc-format-upgrade.c  | 3 +--
 src/s6-rc/s6-rc-init.c            | 3 +--
 src/s6-rc/s6-rc-update.c          | 3 +--
 src/s6-rc/s6-rc.c                 | 3 +--
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/s6-rc/s6-rc-dryrun.c b/src/s6-rc/s6-rc-dryrun.c
index a10acfd..dda5a03 100644
--- a/src/s6-rc/s6-rc-dryrun.c
+++ b/src/s6-rc/s6-rc-dryrun.c
@@ -44,8 +44,7 @@ int main (int argc, char const *const *argv)
     }
     buffer_putflush(buffer_1, "\n", 1) ;
   }
-  tain_now_set_stopwatch() ;
-  tain_now_g() ;
+  tain_now_set_stopwatch_g() ;
   tain_add_g(&deadline, &deadline) ;
   deepsleepuntil_g(&deadline) ;
   return 0 ;
diff --git a/src/s6-rc/s6-rc-fdholder-filler.c b/src/s6-rc/s6-rc-fdholder-filler.c
index 987f3c6..abb0753 100644
--- a/src/s6-rc/s6-rc-fdholder-filler.c
+++ b/src/s6-rc/s6-rc-fdholder-filler.c
@@ -86,8 +86,7 @@ int main (int argc, char const *const *argv)
     s6_fdholder_fd_t dump[n<<1] ;
     close(0) ;
     s6_fdholder_init(&a, 6) ;
-    tain_now_set_stopwatch() ;
-    tain_now_g() ;
+    tain_now_set_stopwatch_g() ;
     tain_add_g(&deadline, &deadline) ;
     for (; i < n ; i++)
     {
diff --git a/src/s6-rc/s6-rc-format-upgrade.c b/src/s6-rc/s6-rc-format-upgrade.c
index 12c25e1..15399b6 100644
--- a/src/s6-rc/s6-rc-format-upgrade.c
+++ b/src/s6-rc/s6-rc-format-upgrade.c
@@ -59,8 +59,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
   if (argv[0][0] != '/')
     strerr_dief2x(100, argv[0], " is not an absolute path") ;
 
-  tain_now_set_stopwatch() ;
-  tain_now_g() ;
+  tain_now_set_stopwatch_g() ;
   tain_add_g(&deadline, &deadline) ;
 
   if (!s6rc_lock(live, 2, &livelock, 0, 0, 0, blocking))
diff --git a/src/s6-rc/s6-rc-init.c b/src/s6-rc/s6-rc-init.c
index 370de32..e3a1984 100644
--- a/src/s6-rc/s6-rc-init.c
+++ b/src/s6-rc/s6-rc-init.c
@@ -67,8 +67,7 @@ int main (int argc, char const *const *argv)
   if (strchr(prefix, '/') || strchr(prefix, '\n'))
     strerr_dief1x(100, "prefix cannot contain a / or a newline") ;
 
-  tain_now_set_stopwatch() ;
-  tain_now_g() ;
+  tain_now_set_stopwatch_g() ;
   tain_add_g(&deadline, &deadline) ;
 
   if (deref)
diff --git a/src/s6-rc/s6-rc-update.c b/src/s6-rc/s6-rc-update.c
index 02e3d13..78ab0de 100644
--- a/src/s6-rc/s6-rc-update.c
+++ b/src/s6-rc/s6-rc-update.c
@@ -603,8 +603,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
     size_t prefixlen = 0 ;
     char dbfn[livelen + 10] ;
 
-    tain_now_set_stopwatch() ;
-    tain_now_g() ;
+    tain_now_set_stopwatch_g() ;
     tain_add_g(&deadline, &deadline) ;
 
 
diff --git a/src/s6-rc/s6-rc.c b/src/s6-rc/s6-rc.c
index 1856d8c..d92decf 100644
--- a/src/s6-rc/s6-rc.c
+++ b/src/s6-rc/s6-rc.c
@@ -641,8 +641,7 @@ int main (int argc, char const *const *argv)
 
       if (what == 2) return print_services() ;
 
-      tain_now_set_stopwatch() ;
-      tain_now_g() ;
+      tain_now_set_stopwatch_g() ;
       tain_add_g(&deadline, &deadline) ;
 
 
-- 
cgit v1.2.3