Merge lp:~brianaker/gearmand/fix-ssl-valgrind into lp:gearmand

[Brian Aker]

Fix for valgrind warning with ssl.

=== modified file 'libgearman-server/connection.cc'
--- libgearman-server/connection.cc	2013-06-15 09:43:55 +0000
+++ libgearman-server/connection.cc	2013-06-26 23:53:27 +0000
@@ -50,27 +50,27 @@
 #include <assert.h>
 
 static gearman_server_con_st * _server_con_create(gearman_server_thread_st *thread, gearmand_con_st *dcon,
-                                                  gearmand_error_t *ret);
+                                                  gearmand_error_t& ret);
 
 /*
  * Public definitions
  */
 
-gearman_server_con_st *gearman_server_con_add(gearman_server_thread_st *thread, gearmand_con_st *dcon, gearmand_error_t *ret)
+gearman_server_con_st *gearman_server_con_add(gearman_server_thread_st *thread, gearmand_con_st *dcon, gearmand_error_t& ret)
 {
   gearman_server_con_st *con= _server_con_create(thread, dcon, ret);
   if (con)
   {
-    if ((*ret= gearman_io_set_fd(&(con->con), dcon->fd)) != GEARMAND_SUCCESS)
+    if ((ret= gearman_io_set_fd(&(con->con), dcon->fd)) != GEARMAND_SUCCESS)
     {
       gearman_server_con_free(con);
       return NULL;
     }
 
-    *ret= gearmand_io_set_events(con, POLLIN);
-    if (*ret != GEARMAND_SUCCESS)
+    ret= gearmand_io_set_events(con, POLLIN);
+    if (ret != GEARMAND_SUCCESS)
     {
-      gearmand_gerror("gearmand_io_set_events", *ret);
+      gearmand_gerror("gearmand_io_set_events", ret);
       gearman_server_con_free(con);
       return NULL;
     }
@@ -81,7 +81,7 @@
 
 static gearman_server_con_st * _server_con_create(gearman_server_thread_st *thread,
                                                   gearmand_con_st *dcon,
-                                                  gearmand_error_t *ret)
+                                                  gearmand_error_t& ret)
 {
   gearman_server_con_st *con;
 
@@ -95,7 +95,7 @@
     con= new (std::nothrow) gearman_server_con_st;
     if (con == NULL)
     {
-      *ret= gearmand_perror(errno, "new() build_gearman_server_con_st");
+      ret= gearmand_perror(errno, "new() build_gearman_server_con_st");
       return NULL;
     }
   }
@@ -104,7 +104,7 @@
   if (con == NULL)
   {
     gearmand_error("Neigther an allocated gearman_server_con_st() or free listed could be found");
-    *ret= GEARMAND_MEMORY_ALLOCATION_FAILURE;
+    ret= GEARMAND_MEMORY_ALLOCATION_FAILURE;
     return NULL;
   }
 
@@ -148,6 +148,9 @@
   con->timeout_event= NULL;
 
   con->protocol= NULL;
+#if defined(HAVE_CYASSL) && HAVE_CYASSL
+  con->_ssl= NULL;
+#endif
 
   int error;
   if ((error= pthread_mutex_lock(&thread->lock)) == 0)
@@ -158,7 +161,7 @@
       gearmand_log_fatal_perror(GEARMAN_DEFAULT_LOG_PARAM, error, "pthread_mutex_lock");
       gearman_server_con_free(con);
 
-      *ret= GEARMAND_ERRNO;
+      ret= GEARMAND_ERRNO;
       return NULL;
     }
   }
@@ -168,7 +171,7 @@
     gearmand_log_fatal_perror(GEARMAN_DEFAULT_LOG_PARAM, error, "pthread_mutex_lock");
     gearman_server_con_free(con);
 
-    *ret= GEARMAND_ERRNO;
+    ret= GEARMAND_ERRNO;
     return NULL;
   }
 
 
=== modified file 'libgearman-server/connection.h'
--- libgearman-server/connection.h	2013-03-06 04:50:21 +0000
+++ libgearman-server/connection.h	2013-06-26 23:53:27 +0000
@@ -75,7 +75,7 @@
  */
 GEARMAN_API
 gearman_server_con_st *gearman_server_con_add(gearman_server_thread_st *thread, gearmand_con_st *dcon,
-                                              gearmand_error_t *ret);
+                                              gearmand_error_t& ret);
 
 /**
  * Attempt to free a server connection structure.
 
=== modified file 'libgearman-server/gearmand_con.cc'
--- libgearman-server/gearmand_con.cc	2013-05-05 03:23:55 +0000
+++ libgearman-server/gearmand_con.cc	2013-06-26 23:53:27 +0000
@@ -63,7 +63,7 @@
                                  gearmand_con_st *dcon)
 {
   gearmand_error_t ret= GEARMAND_SUCCESS;
-  dcon->server_con= gearman_server_con_add(&(thread->server_thread), dcon, &ret);
+  dcon->server_con= gearman_server_con_add(&(thread->server_thread), dcon, ret);
 
   assert(dcon->server_con || ret != GEARMAND_SUCCESS);
   assert(! dcon->server_con || ret == GEARMAND_SUCCESS);
 
=== modified file 'libgearman-server/io.cc'
--- libgearman-server/io.cc	2013-06-05 21:59:31 +0000
+++ libgearman-server/io.cc	2013-06-26 23:53:27 +0000
@@ -362,7 +362,6 @@
     }
   }
 
-
   connection->_state= gearmand_io_st::GEARMAND_CON_UNIVERSAL_INVALID;
   connection->send_state= gearmand_io_st::GEARMAND_CON_SEND_STATE_NONE;
   connection->recv_state= gearmand_io_st::GEARMAND_CON_RECV_UNIVERSAL_NONE;
 
=== modified file 'libgearman-server/struct/io.h'
--- libgearman-server/struct/io.h	2013-05-11 10:16:19 +0000
+++ libgearman-server/struct/io.h	2013-06-26 23:53:27 +0000
@@ -139,6 +139,9 @@
   char id[GEARMAND_SERVER_CON_ID_SIZE];
   gearmand::protocol::Context* protocol;
   struct event *timeout_event;
+#if defined(HAVE_CYASSL) && HAVE_CYASSL
+  CYASSL* _ssl;
+#endif
 
   gearman_server_con_st()
   {
@@ -166,7 +169,4 @@
       protocol= NULL;
     }
   }
-#if defined(HAVE_CYASSL) && HAVE_CYASSL
-  CYASSL* _ssl;
-#endif
 };