7 files changed, 7 insertions, 14 deletions
diff --git a/src/fdholder/s6-fdholder-delete.c b/src/fdholder/s6-fdholder-delete.c
index 2a50b79..d54a3dd 100644
--- a/src/fdholder/s6-fdholder-delete.c
+++ b/src/fdholder/s6-fdholder-delete.c
@@ -32,8 +32,7 @@ int main (int argc, char const *const *argv)
     else deadline = tain_infinite_relative ;
   }
   if (argc < 2) dieusage() ;
-  tain_now_set_stopwatch() ;
-  tain_now_g() ;
+  tain_now_set_stopwatch_g() ;
   tain_add_g(&deadline, &deadline) ;
   if (!s6_fdholder_start_g(&a, argv[0], &deadline))
     strerr_diefu2sys(111, "connect to a fd-holder daemon at ", argv[0]) ;
diff --git a/src/fdholder/s6-fdholder-getdump.c b/src/fdholder/s6-fdholder-getdump.c
index 7b45124..34aeeb7 100644
--- a/src/fdholder/s6-fdholder-getdump.c
+++ b/src/fdholder/s6-fdholder-getdump.c
@@ -39,8 +39,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
   }
   if (argc < 2) dieusage() ;
 
-  tain_now_set_stopwatch() ;
-  tain_now_g() ;
+  tain_now_set_stopwatch_g() ;
   tain_add_g(&deadline, &deadline) ;
   if (!s6_fdholder_start_g(&a, argv[0], &deadline))
     strerr_diefu2sys(111, "connect to a fd-holder daemon at ", argv[0]) ;
diff --git a/src/fdholder/s6-fdholder-list.c b/src/fdholder/s6-fdholder-list.c
index 2be3a25..8f30683 100644
--- a/src/fdholder/s6-fdholder-list.c
+++ b/src/fdholder/s6-fdholder-list.c
@@ -40,8 +40,7 @@ int main (int argc, char const *const *argv)
   }
 
   if (!argc) dieusage() ;
-  tain_now_set_stopwatch() ;
-  tain_now_g() ;
+  tain_now_set_stopwatch_g() ;
   tain_add_g(&deadline, &deadline) ;
   if (!s6_fdholder_start_g(&a, argv[0], &deadline))
     strerr_diefu2sys(111, "connect to a fd-holder daemon at ", argv[0]) ;
diff --git a/src/fdholder/s6-fdholder-retrieve.c b/src/fdholder/s6-fdholder-retrieve.c
index c6ce4ee..ebfd2ed 100644
--- a/src/fdholder/s6-fdholder-retrieve.c
+++ b/src/fdholder/s6-fdholder-retrieve.c
@@ -37,8 +37,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
   }
   if (argc < 3) dieusage() ;
 
-  tain_now_set_stopwatch() ;
-  tain_now_g() ;
+  tain_now_set_stopwatch_g() ;
   tain_add_g(&deadline, &deadline) ;
   if (!s6_fdholder_start_g(&a, argv[0], &deadline))
     strerr_diefu2sys(111, "connect to a fd-holder daemon at ", argv[0]) ;
diff --git a/src/fdholder/s6-fdholder-setdump.c b/src/fdholder/s6-fdholder-setdump.c
index 3265997..66192a1 100644
--- a/src/fdholder/s6-fdholder-setdump.c
+++ b/src/fdholder/s6-fdholder-setdump.c
@@ -40,8 +40,7 @@ int main (int argc, char const *const *argv)
   x = getenv("S6_FD#") ;
   if (!x) strerr_dienotset(100, "S6_FD#") ;
   if (!uint0_scan(x, &dumplen)) strerr_dieinvalid(100, "S6_FD#") ;
-  tain_now_set_stopwatch() ;
-  tain_now_g() ;
+  tain_now_set_stopwatch_g() ;
   tain_add_g(&deadline, &deadline) ;
   if (!s6_fdholder_start_g(&a, argv[0], &deadline))
     strerr_diefu2sys(111, "connect to a fd-holder daemon at ", argv[0]) ;
diff --git a/src/fdholder/s6-fdholder-store.c b/src/fdholder/s6-fdholder-store.c
index bc221cd..081192f 100644
--- a/src/fdholder/s6-fdholder-store.c
+++ b/src/fdholder/s6-fdholder-store.c
@@ -38,8 +38,7 @@ int main (int argc, char const *const *argv)
   }
   if (argc < 2) dieusage() ;
 
-  tain_now_set_stopwatch() ;
-  tain_now_g() ;
+  tain_now_set_stopwatch_g() ;
   tain_add_g(&deadline, &deadline) ;
   tain_add_g(&limit, &limit) ;
   if (!s6_fdholder_start_g(&a, argv[0], &deadline))
diff --git a/src/fdholder/s6-fdholder-transferdump.c b/src/fdholder/s6-fdholder-transferdump.c
index d7730a9..a52f7a4 100644
--- a/src/fdholder/s6-fdholder-transferdump.c
+++ b/src/fdholder/s6-fdholder-transferdump.c
@@ -53,8 +53,7 @@ int main (int argc, char const *const *argv)
   }
   if (argc < 2) dieusage() ;
 
-  tain_now_set_stopwatch() ;
-  tain_now_g() ;
+  tain_now_set_stopwatch_g() ;
   tain_add_g(&deadline, &deadline) ;
   if (!s6_fdholder_start_g(&a, argv[0], &deadline))
     strerr_diefu2sys(111, "connect to a source fd-holder daemon at ", argv[0]) ;