Changeset 8da0c7e in mod_gnutls for src/gnutls_io.c

Timestamp:

Oct 11, 2020, 10:11:12 AM (5 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio

Children:

d8c4d75

Parents:

6be4dd0

Message:

Limit variable scopes in gnutls_io.c

This fixes issues found using CppCheck?.

File:

• src/gnutls_io.c (modified) (7 diffs)

src/gnutls_io.c

@@ -103 +103 @@
         const char *str;
         apr_size_t str_len;
-        apr_size_t consume;
 
         /* Justin points out this is an http-ism that might
@@ -140 +139 @@
 
             /* Assure we don't overflow. */
-            consume =
-                    (str_len + actual >
-                    *len) ? *len - actual : str_len;
+            apr_size_t consume =
+                (str_len + actual > *len) ? *len - actual : str_len;
 
             memcpy(c, str, consume);
@@ -177 +175 @@
     apr_size_t wanted = *len;
     apr_size_t bytes = 0;
-    int rc;
 
     *len = 0;
@@ -221 +218 @@
     {
         /* Note: The pull function sets ctxt->input_rc */
-        rc = gnutls_record_recv(ctxt->session, buf + bytes, wanted - bytes);
+        int rc = gnutls_record_recv(ctxt->session,
+                                    buf + bytes, wanted - bytes);
 
         if (rc > 0) {
@@ -311 +309 @@
         char *buf, apr_size_t * len) {
     const char *pos = NULL;
-    apr_status_t status;
     apr_size_t tmplen = *len, buflen = *len, offset = 0;
 
     *len = 0;
 
-    while (tmplen > 0) {
-        status = gnutls_io_input_read(ctxt, buf + offset, &tmplen);
+    while (tmplen > 0)
+    {
+        apr_status_t status =
+            gnutls_io_input_read(ctxt, buf + offset, &tmplen);
 
         if (status != APR_SUCCESS) {
@@ -959 +958 @@
 {
     mgs_handle_t *ctxt = ptr;
-    apr_status_t rc;
     apr_size_t in = len;
     apr_read_type_e block = ctxt->input_block;
@@ -980 +978 @@
     if (APR_BRIGADE_EMPTY(ctxt->input_bb))
     {
-        rc = ap_get_brigade(ctxt->input_filter->next,
-                            ctxt->input_bb, AP_MODE_READBYTES,
-                            ctxt->input_block, in);
+        apr_status_t rc = ap_get_brigade(ctxt->input_filter->next,
+                                         ctxt->input_bb, AP_MODE_READBYTES,
+                                         ctxt->input_block, in);
 
         /* Not a problem, there was simply no data ready yet.