diff options
author | Pauli <paul.dale@oracle.com> | 2017-07-12 14:18:00 +1000 |
---|---|---|
committer | Pauli <paul.dale@oracle.com> | 2017-07-13 07:34:40 +1000 |
commit | 084f9a7046c9a4d352278e3639290316c8c30f38 (patch) | |
tree | eaa820a862b659432590ed07c5651cb61daaceda /demos/bio/saccept.c | |
parent | 6e2e6ed4faefc7ac57fd053cfac227352632fb81 (diff) |
Demo style fixes and modernisation.
Address some style issues in the demos and modernise the C.
Fix the exit/return from main handling.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3914)
Diffstat (limited to 'demos/bio/saccept.c')
-rw-r--r-- | demos/bio/saccept.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/demos/bio/saccept.c b/demos/bio/saccept.c index 66c5c61755..de86ae6322 100644 --- a/demos/bio/saccept.c +++ b/demos/bio/saccept.c @@ -1,5 +1,5 @@ /* - * Copyright 1998-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1998-2017 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -19,12 +19,13 @@ #include <stdio.h> #include <signal.h> +#include <stdlib.h> #include <openssl/err.h> #include <openssl/ssl.h> #define CERT_FILE "server.pem" -static int done = 0; +static volatile int done = 0; void interrupt(int sig) { @@ -51,7 +52,7 @@ int main(int argc, char *argv[]) BIO *ssl_bio, *tmp; SSL_CTX *ctx; char buf[512]; - int ret = 1, i; + int ret = EXIT_FAILURE, i; if (argc <= 1) port = "*:4433"; @@ -111,12 +112,10 @@ int main(int argc, char *argv[]) fflush(stdout); } - ret = 0; + ret = EXIT_SUCCESS; err: - if (ret) { + if (ret != EXIT_SUCCESS) ERR_print_errors_fp(stderr); - } BIO_free(in); - exit(ret); - return (!ret); + return ret; } |