Changeset d54572e in mod_gnutls

Timestamp:

Oct 11, 2020, 10:32:27 AM (4 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio

Children:

3e61371

Parents:

d8c4d75

Message:

Limit variable scopes in gnutls_hooks.c

This fixes issues found using CppCheck?.

File:

• src/gnutls_hooks.c (modified) (6 diffs)

src/gnutls_hooks.c

@@ -577 +577 @@
     int rv;
     server_rec *s;
-    mgs_srvconf_rec *sc;
     mgs_srvconf_rec *sc_base;
 
@@ -646 +645 @@
     for (s = base_server; s; s = s->next)
     {
-        sc = (mgs_srvconf_rec *) ap_get_module_config(s->module_config, &gnutls_module);
+        mgs_srvconf_rec *sc = (mgs_srvconf_rec *)
+            ap_get_module_config(s->module_config, &gnutls_module);
         sc->s = s;
         sc->cache_enable = sc_base->cache_enable;
@@ -942 +942 @@
 static int vhost_cb(void *baton, conn_rec *conn, server_rec * s)
 {
-    mgs_srvconf_rec *tsc;
     vhost_cb_rec *x = baton;
-    int ret;
-
+    mgs_srvconf_rec *tsc = (mgs_srvconf_rec *)
+        ap_get_module_config(s->module_config, &gnutls_module);
     _gnutls_log(debug_log_fp, "%s: %d\n", __func__, __LINE__);
-    tsc = (mgs_srvconf_rec *) ap_get_module_config(s->module_config,
-            &gnutls_module);
 
     if (tsc->enabled != GNUTLS_ENABLED_TRUE) {
@@ -957 +954 @@
         /* this check is there to warn administrator of any missing hostname
          * in the certificate. */
-        ret = gnutls_x509_crt_check_hostname(tsc->certs_x509_crt_chain[0], s->server_hostname);
+        int ret = gnutls_x509_crt_check_hostname(tsc->certs_x509_crt_chain[0],
+                                                 s->server_hostname);
         if (0 == ret)
             ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, conn,
@@ -1608 +1606 @@
     for (int i = 0; !(ret < 0); i++)
     {
-        const char *san, *sanlabel;
         len = 0;
         ret = gnutls_x509_crt_get_subject_alt_name(cert, i,
@@ -1624 +1621 @@
             tmp2[len] = 0;
 
+            const char *san, *sanlabel;
             sanlabel = apr_psprintf(r->pool, "%s%u", MGS_SIDE("_S_AN"), i);
             if (ret == GNUTLS_SAN_DNSNAME) {