From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 7 Mar 2016 16:03:45 +0000 (+1300)
Subject: Cleanup: remove last goto in libsslsquid
X-Git-Tag: SQUID_4_0_8~48
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=627059a53624ab4a3c1ca206623b8b295166d5aa;p=thirdparty%2Fsquid.git

Cleanup: remove last goto in libsslsquid
---

diff --git a/src/ssl/support.cc b/src/ssl/support.cc
index a978fc329e..611c412d33 100644
--- a/src/ssl/support.cc
+++ b/src/ssl/support.cc
@@ -743,26 +743,20 @@ static const char *
 ssl_get_attribute(X509_NAME * name, const char *attribute_name)
 {
     static char buffer[1024];
-    int nid;
-
     buffer[0] = '\0';
 
     if (strcmp(attribute_name, "DN") == 0) {
         X509_NAME_oneline(name, buffer, sizeof(buffer));
-        goto done;
-    }
-
-    nid = OBJ_txt2nid((char *) attribute_name);
-
-    if (nid == 0) {
-        debugs(83, DBG_IMPORTANT, "WARNING: Unknown SSL attribute name '" << attribute_name << "'");
-        return NULL;
+    } else {
+        int nid = OBJ_txt2nid(const_cast<char *>(attribute_name));
+        if (nid == 0) {
+            debugs(83, DBG_IMPORTANT, "WARNING: Unknown SSL attribute name '" << attribute_name << "'");
+            return nullptr;
+        }
+        X509_NAME_get_text_by_NID(name, nid, buffer, sizeof(buffer));
     }
 
-    X509_NAME_get_text_by_NID(name, nid, buffer, sizeof(buffer));
-
-done:
-    return *buffer ? buffer : NULL;
+    return *buffer ? buffer : nullptr;
 }
 
 /// \ingroup ServerProtocolSSLInternal