trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject [trafficserver] branch master updated: TS-5022: remove goto
Date Tue, 10 Jan 2017 15:12:54 GMT
This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

The following commit(s) were added to refs/heads/master by this push:
       new  33b9dc6   TS-5022: remove goto
33b9dc6 is described below

commit 33b9dc6dfa01a8dec45d03c33bbbc5e6e1bf4929
Author: Persia Aziz <persia@yahoo-inc.com>
AuthorDate: Mon Jan 9 17:11:13 2017 -0600

    TS-5022: remove goto
---
 iocore/net/SSLConfig.cc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/iocore/net/SSLConfig.cc b/iocore/net/SSLConfig.cc
index d53ba64..18b9a14 100644
--- a/iocore/net/SSLConfig.cc
+++ b/iocore/net/SSLConfig.cc
@@ -411,17 +411,16 @@ SSLConfigParams::getNewCTX(char *client_cert) const
   nclient_ctx          = SSLInitClientContext(this);
   if (!nclient_ctx) {
     SSLError("Can't initialize the SSL client, HTTPS in remap rules will not function");
+    return nullptr;
   }
   if (nclient_ctx && client_cert != nullptr) {
     if (!SSL_CTX_use_certificate_chain_file(nclient_ctx, (const char *)client_cert)) {
       SSLError("failed to load client certificate from %s", this->clientCertPath);
-      goto fail;
+      SSLReleaseContext(nclient_ctx);
+      return nullptr;
     }
   }
   return nclient_ctx;
-fail:
-  SSLReleaseContext(nclient_ctx);
-  return nullptr;
 }
 
 void

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <commits@trafficserver.apache.org>'].

Mime
View raw message