commit f5ca0b04bbc98b5b8a41f5cd7b4ee35e345c1e6c
author Matt Caswell <matt@openssl.org> Mon Nov 21 12:10:35 2016 +0000
committer Matt Caswell <matt@openssl.org> Wed Nov 23 15:31:22 2016 +0000
tree 3fef7ec0fef9056550c00166c4c538278d730773
parent c805f6189e7384d8f27e82c09ee8cae202ade876

Fix some style issues identified during review

Reviewed-by: Rich Salz <rsalz@openssl.org>

apps/s_server.c

diff --git a/apps/s_server.c b/apps/s_server.c
index 7eee910..eebbb56 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -451,16 +451,16 @@
 /* Structure passed to cert status callback */
 
 typedef struct tlsextstatusctx_st {
+    int timeout;
     /* File to load OCSP Response from (or NULL if no file) */
     char *respin;
     /* Default responder to use */
     char *host, *path, *port;
     int use_ssl;
-    int timeout;
     int verbose;
 } tlsextstatusctx;
 
-static tlsextstatusctx tlscstatp = { NULL, NULL, NULL, NULL, 0, -1, 0 };
+static tlsextstatusctx tlscstatp = { -1 };
 
 #ifndef OPENSSL_NO_OCSP
 
@@ -553,7 +553,7 @@
  err:
     ret = SSL_TLSEXT_ERR_ALERT_FATAL;
  done:
-    if (aia) {
+    if (aia != NULL) {
         OPENSSL_free(host);
         OPENSSL_free(path);
         OPENSSL_free(port);
@@ -589,7 +589,7 @@
         }
         resp = d2i_OCSP_RESPONSE_bio(derbio, NULL);
         BIO_free(derbio);
-        if (!resp) {
+        if (resp == NULL) {
             BIO_puts(bio_err, "cert_status: Error reading OCSP response\n");
             goto err;
         }