Changeset 19f2719 in mod_gnutls for src

Timestamp:

May 27, 2016, 12:26:15 PM (3 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

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

Children:

eda8686

Parents:

a9fa300

Message:

Update comments and formating in push/pull functions

File:

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

src/gnutls_io.c

@@ -787 +787 @@
 
     /* If Len = 0, we don't do anything. */
-    if (!len || buffer == NULL) {
+    if (!len || buffer == NULL)
+    {
         return 0;
     }
-    if (!ctxt->input_bb) {
+    /* Input bucket brigade is missing, EOF */
+    if (!ctxt->input_bb)
+    {
         ctxt->input_rc = APR_EOF;
         gnutls_transport_set_errno(ctxt->session, ECONNABORTED);
@@ -796 +799 @@
     }
 
-    if (APR_BRIGADE_EMPTY(ctxt->input_bb)) {
-
+    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);
+                            ctxt->input_bb, AP_MODE_READBYTES,
+                            ctxt->input_block, in);
 
         /* Not a problem, there was simply no data ready yet.
@@ -820 +823 @@
         }
 
-        if (rc != APR_SUCCESS) {
+        if (rc != APR_SUCCESS)
+        {
             /* Unexpected errors discard the brigade */
             apr_brigade_cleanup(ctxt->input_bb);
@@ -829 +833 @@
     }
 
-    ctxt->input_rc =
-            brigade_consume(ctxt->input_bb, block, buffer, &len);
-
-    if (ctxt->input_rc == APR_SUCCESS) {
+    ctxt->input_rc = brigade_consume(ctxt->input_bb, block, buffer, &len);
+
+    if (ctxt->input_rc == APR_SUCCESS)
+    {
         return (ssize_t) len;
     }
@@ -850 +854 @@
 
     /* Unexpected errors and APR_EOF clean out the brigade.
-     * Subsequent calls will return APR_EOF.
-     */
+     * Subsequent calls will return APR_EOF. */
     apr_brigade_cleanup(ctxt->input_bb);
     ctxt->input_bb = NULL;
 
-    if (APR_STATUS_IS_EOF(ctxt->input_rc) && len) {
-        /* Provide the results of this read pass,
-         * without resetting the BIO retry_read flag
-         */
+    if (APR_STATUS_IS_EOF(ctxt->input_rc) && len)
+    {
+        /* Some data has been received before EOF, return it. */
         return (ssize_t) len;
     }
@@ -877 +879 @@
  */
 ssize_t mgs_transport_write(gnutls_transport_ptr_t ptr,
-        const void *buffer, size_t len) {
+                            const void *buffer, size_t len)
+{
     mgs_handle_t *ctxt = ptr;