From: Ben Pfaff <blp@nicira.com>
Date: Fri, 28 Jan 2011 22:39:23 +0000 (-0800)
Subject: stream-ssl: Break interpretation of queued error into new function.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=246f5b5edee9a35d8126a1d15c4f43328cf38570;p=openvswitch

stream-ssl: Break interpretation of queued error into new function.

The following commit will introduce another user.
---

diff --git a/lib/stream-ssl.c b/lib/stream-ssl.c
index 84c1a115..5a67da8f 100644
--- a/lib/stream-ssl.c
+++ b/lib/stream-ssl.c
@@ -188,6 +188,7 @@ static int do_ssl_init(void);
 static bool ssl_wants_io(int ssl_error);
 static void ssl_close(struct stream *);
 static void ssl_clear_txbuf(struct ssl_stream *);
+static void interpret_queued_ssl_error(const char *function);
 static int interpret_ssl_error(const char *function, int ret, int error,
                                int *want);
 static DH *tmp_dh_callback(SSL *ssl, int is_export OVS_UNUSED, int keylength);
@@ -600,6 +601,18 @@ ssl_close(struct stream *stream)
     free(sslv);
 }
 
+static void
+interpret_queued_ssl_error(const char *function)
+{
+    int queued_error = ERR_get_error();
+    if (queued_error != 0) {
+        VLOG_WARN_RL(&rl, "%s: %s",
+                     function, ERR_error_string(queued_error, NULL));
+    } else {
+        VLOG_ERR_RL(&rl, "%s: SSL_ERROR_SSL without queued error", function);
+    }
+}
+
 static int
 interpret_ssl_error(const char *function, int ret, int error,
                     int *want)
@@ -656,17 +669,9 @@ interpret_ssl_error(const char *function, int ret, int error,
         }
     }
 
-    case SSL_ERROR_SSL: {
-        int queued_error = ERR_get_error();
-        if (queued_error != 0) {
-            VLOG_WARN_RL(&rl, "%s: %s",
-                         function, ERR_error_string(queued_error, NULL));
-        } else {
-            VLOG_ERR_RL(&rl, "%s: SSL_ERROR_SSL without queued error",
-                        function);
-        }
+    case SSL_ERROR_SSL:
+        interpret_queued_ssl_error(function);
         break;
-    }
 
     default:
         VLOG_ERR_RL(&rl, "%s: bad SSL error code %d", function, error);