[Spice-devel] [spice-gtk] channel: Move local variables to inner block

Christophe Fergeau cfergeau at redhat.com
Thu Feb 16 15:13:37 UTC 2017


Less things to keep track of when taking a quick look at the code flow
of the spice_channel_load_ca() method.

Signed-off-by: Christophe Fergeau <cfergeau at redhat.com>
---
 src/spice-channel.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/spice-channel.c b/src/spice-channel.c
index 6556db3..b60b284 100644
--- a/src/spice-channel.c
+++ b/src/spice-channel.c
@@ -2364,10 +2364,6 @@ static gboolean spice_channel_delayed_unref(gpointer data)
 static int spice_channel_load_ca(SpiceChannel *channel)
 {
     SpiceChannelPrivate *c = channel->priv;
-    STACK_OF(X509_INFO) *inf;
-    X509_INFO *itmp;
-    X509_STORE *store;
-    BIO *in;
     int i, count = 0;
     guint8 *ca;
     guint size;
@@ -2382,6 +2378,11 @@ static int spice_channel_load_ca(SpiceChannel *channel)
     CHANNEL_DEBUG(channel, "Load CA, file: %s, data: %p", ca_file, ca);
 
     if (ca != NULL) {
+        STACK_OF(X509_INFO) *inf;
+        X509_INFO *itmp;
+        X509_STORE *store;
+        BIO *in;
+
         store = SSL_CTX_get_cert_store(c->ctx);
         in = BIO_new_mem_buf(ca, size);
         inf = PEM_X509_INFO_read_bio(in, NULL, NULL, NULL);
-- 
2.9.3



More information about the Spice-devel mailing list