Changeset dff03fa in mod_gnutls

Timestamp:

Sep 18, 2015, 7:45:20 PM (4 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, master, upstream

Children:

34e5dc7

Parents:

9ca1f21

Message:

Configure C99 mode

Variable declarations in for loops improve code readability.

Files:

• configure.ac (modified) (1 diff)
• src/gnutls_hooks.c (modified) (9 diffs)

configure.ac

@@ -16 +16 @@
 
 AC_PROG_CC
+AC_PROG_CC_C99
 AC_PROG_LD
 AC_PROG_INSTALL

src/gnutls_hooks.c

@@ -220 +220 @@
 static int read_crt_cn(server_rec * s, apr_pool_t * p, gnutls_x509_crt_t cert, char **cert_cn) {
 
-    int rv = 0, i;
+    int rv = 0;
     size_t data_len;
 
@@ -242 +242 @@
         rv = 0;
         /* read subject alternative name */
-        for (i = 0; !(rv < 0); i++) {
+        for (int i = 0; !(rv < 0); i++)
+        {
             data_len = 0;
             rv = gnutls_x509_crt_get_subject_alt_name(cert, i,
@@ -337 +338 @@
         else
         {
-            int i;
-            for (i = 0; i < sc_base->p11_modules->nelts; i++)
+            for (int i = 0; i < sc_base->p11_modules->nelts; i++)
             {
                 char *p11_module =
@@ -559 +559 @@
 int check_server_aliases(vhost_cb_rec *x, server_rec * s, mgs_srvconf_rec *tsc) {
         apr_array_header_t *names;
-        int i,rv = 0;
+        int rv = 0;
         char ** name;
 
@@ -571 +571 @@
                 names = s->names;
                 name = (char **)names->elts;
-                for (i = 0; i < names->nelts; ++i) {
+                for (int i = 0; i < names->nelts; ++i)
+        {
                         if (!name[i]) { continue; }
                                 if (apr_strnatcasecmp(x->sni_name, name[i]) == 0) {
@@ -583 +584 @@
                 names = s->wild_names;
         name = (char **)names->elts;
-                for (i = 0; i < names->nelts; ++i) {
+                for (int i = 0; i < names->nelts; ++i)
+        {
                         if (!name[i]) { continue; }
                                 if(apr_fnmatch(name[i], x->sni_name ,
@@ -1034 +1036 @@
     char *tmp2;
     size_t len;
-    int ret, i;
+    int ret;
 
     if (r == NULL)
@@ -1109 +1111 @@
 
     /* export all the alternative names (DNS, RFC822 and URI) */
-    for (i = 0; !(ret < 0); i++) {
+    for (int i = 0; !(ret < 0); i++)
+    {
         const char *san, *sanlabel;
         len = 0;
@@ -1474 +1477 @@
 
 exit:
-    if (gnutls_certificate_type_get(ctxt->session) == GNUTLS_CRT_X509) {
-        unsigned int i;
-        for (i = 0; i < ch_size; i++) {
+    if (gnutls_certificate_type_get(ctxt->session) == GNUTLS_CRT_X509)
+        for (unsigned int i = 0; i < ch_size; i++)
             gnutls_x509_crt_deinit(cert.x509[i]);
-        }
-    } else if (gnutls_certificate_type_get(ctxt->session) ==
-            GNUTLS_CRT_OPENPGP)
+    else if (gnutls_certificate_type_get(ctxt->session) ==
+             GNUTLS_CRT_OPENPGP)
         gnutls_openpgp_crt_deinit(cert.pgp);
     return ret;
-
-
-}
+}
+
+
 
 #ifdef ENABLE_MSVA