From 3918fa1a9488d56040d43e4af1254f9564266513 Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Tue, 5 Oct 2021 14:05:56 +0900
Subject: [PATCH] agent,dirmngr,kbx,scd,tpm2d: Use gnupg_sleep.

* agent/findkey.c (unprotect): Use gnupg_sleep.
* agent/gpg-agent.c (handle_connections): Likewise.
* dirmngr/crlfetch.c (handle_connections): Likewise.
* kbx/keyboxd.c (handle_connections): Likewise.
* tpm2d/tpm3daemon.c (handle_connections): Likewise.
* scd/scdaemon.c (handle_connections): Likewise.
* scd/command.c (cmd_lock): Likewise.
* dirmngr/ldap-wrapper.c (ldap_reaper_thread): Likewise.
(ldap_wrapper_wait_connections): Use gnupg_usleep.

--

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
---
 agent/findkey.c        | 2 +-
 agent/gpg-agent.c      | 2 +-
 dirmngr/crlfetch.c     | 2 +-
 dirmngr/dirmngr.c      | 2 +-
 dirmngr/ldap-wrapper.c | 6 +++---
 kbx/keyboxd.c          | 2 +-
 scd/command.c          | 6 +++---
 scd/scdaemon.c         | 2 +-
 tpm2d/tpm2daemon.c     | 2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/agent/findkey.c b/agent/findkey.c
index 28ff61781..0ba937aad 100644
--- a/agent/findkey.c
+++ b/agent/findkey.c
@@ -721,7 +721,7 @@ unprotect (ctrl_t ctrl, const char *cache_nonce, const char *desc_text,
             {
               /* We need to give the other thread a chance to actually put
                  it into the cache. */
-              npth_sleep (1);
+              gnupg_sleep (1);
               goto retry;
             }
           /* Timeout - better call pinentry now the plain way. */
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index dd60847e6..2c4d313f5 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -3041,7 +3041,7 @@ handle_connections (gnupg_fd_t listen_fd,
 	{
           log_error (_("npth_pselect failed: %s - waiting 1s\n"),
                      strerror (saved_errno));
-          npth_sleep (1);
+          gnupg_sleep (1);
           continue;
 	}
       if (ret <= 0)
diff --git a/dirmngr/crlfetch.c b/dirmngr/crlfetch.c
index e355aab16..b3fdc0cc6 100644
--- a/dirmngr/crlfetch.c
+++ b/dirmngr/crlfetch.c
@@ -73,7 +73,7 @@ register_file_reader (ksba_reader_t reader, struct reader_cb_context_s *cb_ctx)
             return;
           }
       log_info (_("reader to file mapping table full - waiting\n"));
-      npth_sleep (2);
+      gnupg_sleep (2);
     }
 }
 
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index 330983f3f..36ef873c2 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -2321,7 +2321,7 @@ handle_connections (assuan_fd_t listen_fd)
 	{
           log_error (_("npth_pselect failed: %s - waiting 1s\n"),
                      strerror (saved_errno));
-          npth_sleep (1);
+          gnupg_sleep (1);
           continue;
 	}
 
diff --git a/dirmngr/ldap-wrapper.c b/dirmngr/ldap-wrapper.c
index 629c5c277..446e54317 100644
--- a/dirmngr/ldap-wrapper.c
+++ b/dirmngr/ldap-wrapper.c
@@ -329,7 +329,7 @@ ldap_reaper_thread (void *dummy)
                            " - waiting 1s\n", gpg_strerror (err));
                 /* Note: Here we unlock and continue! */
                 unlock_reaper_list ();
-                npth_sleep (1);
+                gnupg_sleep (1);
                 continue;
             }
             fparraysize = count;
@@ -393,7 +393,7 @@ ldap_reaper_thread (void *dummy)
           xfree (fparray);
           fparray = NULL;
           fparraysize = 0;
-          npth_sleep (1);
+          gnupg_sleep (1);
           continue;
 	}
 
@@ -582,7 +582,7 @@ ldap_wrapper_wait_connections ()
   }
   unlock_reaper_list ();
   while (reaper_list)
-    npth_usleep (200);
+    gnupg_usleep (200);
 }
 
 
diff --git a/kbx/keyboxd.c b/kbx/keyboxd.c
index 3f759e6f7..404fe46fe 100644
--- a/kbx/keyboxd.c
+++ b/kbx/keyboxd.c
@@ -1607,7 +1607,7 @@ handle_connections (gnupg_fd_t listen_fd)
 	{
           log_error (_("npth_pselect failed: %s - waiting 1s\n"),
                      strerror (saved_errno));
-          npth_sleep (1);
+          gnupg_sleep (1);
           continue;
 	}
       if (ret <= 0)
diff --git a/scd/command.c b/scd/command.c
index 0819318e7..6ffc13626 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -1726,9 +1726,9 @@ cmd_lock (assuan_context_t ctx, char *line)
   if (rc && has_option (line, "--wait"))
     {
       rc = 0;
-      npth_sleep (1); /* Better implement an event mechanism. However,
-                         for card operations this should be
-                         sufficient. */
+      gnupg_sleep (1); /* Better implement an event mechanism. However,
+                          for card operations this should be
+                          sufficient. */
       /* Send a progress so that we can detect a connection loss.  */
       rc = send_status_printf (ctrl, "PROGRESS", "scd_locked . 0 0");
       if (!rc)
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index da1f21d1f..e017b3f12 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -1375,7 +1375,7 @@ handle_connections (int listen_fd)
         {
           log_error (_("npth_pselect failed: %s - waiting 1s\n"),
                      strerror (saved_errno));
-          npth_sleep (1);
+          gnupg_sleep (1);
           continue;
         }
 
diff --git a/tpm2d/tpm2daemon.c b/tpm2d/tpm2daemon.c
index 261896cc2..b68579352 100644
--- a/tpm2d/tpm2daemon.c
+++ b/tpm2d/tpm2daemon.c
@@ -1215,7 +1215,7 @@ handle_connections (int listen_fd)
         {
           log_error (_("npth_pselect failed: %s - waiting 1s\n"),
                      strerror (saved_errno));
-          npth_sleep (1);
+          gnupg_sleep (1);
           continue;
         }