Demo style fixes and modernisation.

[openssl.git] / demos / bio / saccept.c

diff --git a/demos/bio/saccept.c b/demos/bio/saccept.c
index 66c5c6175502d03f7427f54e3523102794d1007e..de86ae6322b8a08df168b85bc68bcfe1c1386b47 100644 (file)
--- 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
  *
  * 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 <stdio.h>
 #include <signal.h>

+#include <stdlib.h>

 #include <openssl/err.h>
 #include <openssl/ssl.h>
 
 #define CERT_FILE       "server.pem"
 
 #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)
 {
 
 void interrupt(int sig)
 {


@@ -51,7 +52,7 @@ int main(int argc, char *argv[])
     BIO *ssl_bio, *tmp;
     SSL_CTX *ctx;
     char buf[512];
     BIO *ssl_bio, *tmp;
     SSL_CTX *ctx;
     char buf[512];

-    int ret = 1, i;
+    int ret = EXIT_FAILURE, i;

 
     if (argc <= 1)
         port = "*:4433";
 
     if (argc <= 1)
         port = "*:4433";


@@ -111,12 +112,10 @@ int main(int argc, char *argv[])
         fflush(stdout);
     }
 
         fflush(stdout);
     }
 

-    ret = 0;
+    ret = EXIT_SUCCESS;

  err:
  err:

-    if (ret) {
+    if (ret != EXIT_SUCCESS)

         ERR_print_errors_fp(stderr);
         ERR_print_errors_fp(stderr);

-    }

     BIO_free(in);
     BIO_free(in);

-    exit(ret);
-    return (!ret);
+    return ret;

 }
 }