diff options
| author | Richard Levitte <levitte@openssl.org> | 2022-10-03 07:22:52 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2022-10-06 08:01:09 +0200 |
| commit | 5139dec255d0e2f991083cba9d9c62dbe6637046 (patch) | |
| tree | 200e588ef77b7f2f698a1dfdaaf41c7232becbfd /apps | |
| parent | 82d28c6b3cbd8074faaa34cc2ce57dacc580792f (diff) | |
Rename ossl_sleep calls to OSSL_sleep everywhere
Also, remove inclusions of internal/e_os.h where it seems no longer
necessary.
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/19330)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/cmp.c | 2 | ||||
| -rw-r--r-- | apps/lib/http_server.c | 6 | ||||
| -rw-r--r-- | apps/s_server.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/apps/cmp.c b/apps/cmp.c index bac54f1265..24672144fe 100644 --- a/apps/cmp.c +++ b/apps/cmp.c @@ -2688,7 +2688,7 @@ static int cmp_server(OSSL_CMP_CTX *srv_cmp_ctx) prog, 0, 0); if (ret == 0) { /* no request yet */ if (retry) { - ossl_sleep(1000); + OSSL_sleep(1000); retry = 0; continue; } diff --git a/apps/lib/http_server.c b/apps/lib/http_server.c index 3f9f884c69..03afd715be 100644 --- a/apps/lib/http_server.c +++ b/apps/lib/http_server.c @@ -65,7 +65,7 @@ static void killall(int ret, pid_t *kidpids) if (kidpids[i] != 0) (void)kill(kidpids[i], SIGTERM); OPENSSL_free(kidpids); - ossl_sleep(1000); + OSSL_sleep(1000); exit(ret); } @@ -141,7 +141,7 @@ void spawn_loop(const char *prog) "child process: %ld, term signal %d%s", (long)fpid, WTERMSIG(status), dumped); } - ossl_sleep(1000); + OSSL_sleep(1000); } break; } else if (errno != EINTR) { @@ -156,7 +156,7 @@ void spawn_loop(const char *prog) switch (fpid = fork()) { case -1: /* error */ /* System critically low on memory, pause and try again later */ - ossl_sleep(30000); + OSSL_sleep(30000); break; case 0: /* child */ OPENSSL_free(kidpids); diff --git a/apps/s_server.c b/apps/s_server.c index c04da1fc68..8a573d4414 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -3184,7 +3184,7 @@ static int www_body(int s, int stype, int prot, unsigned char *context) continue; } #endif - ossl_sleep(1000); + OSSL_sleep(1000); continue; } } else if (i == 0) { /* end of input */ @@ -3625,7 +3625,7 @@ static int rev_body(int s, int stype, int prot, unsigned char *context) continue; } #endif - ossl_sleep(1000); + OSSL_sleep(1000); continue; } } else if (i == 0) { /* end of input */ |