[Openvas-commits] r217 - in trunk/openvas-libraries: . libopenvas

[scm-commit@wald.intevation.org]

Author: bh
Date: 2007-06-04 15:57:33 +0200 (Mon, 04 Jun 2007)
New Revision: 217

Modified:
   trunk/openvas-libraries/ChangeLog
   trunk/openvas-libraries/libopenvas/network.c
Log:
* libopenvas/network.c (struct nessus_connection)
(open_SSL_connection, write_stream_connection4): Remove
nessus_connection member last_ssl_err because it's only assigned
to, but never used.


Modified: trunk/openvas-libraries/ChangeLog
===================================================================
--- trunk/openvas-libraries/ChangeLog	2007-05-25 22:43:13 UTC (rev 216)
+++ trunk/openvas-libraries/ChangeLog	2007-06-04 13:57:33 UTC (rev 217)
@@ -1,3 +1,10 @@
+2007-06-04  Bernhard Herzog  <bh at intevation.de>
+
+	* libopenvas/network.c (struct nessus_connection)
+	(open_SSL_connection, write_stream_connection4): Remove
+	nessus_connection member last_ssl_err because it's only assigned
+	to, but never used.
+
 2007-05-25  Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>
 
 	* VERSION: Renamed from CVS to SVN.

Modified: trunk/openvas-libraries/libopenvas/network.c
===================================================================
--- trunk/openvas-libraries/libopenvas/network.c	2007-05-25 22:43:13 UTC (rev 216)
+++ trunk/openvas-libraries/libopenvas/network.c	2007-06-04 13:57:33 UTC (rev 217)
@@ -69,7 +69,6 @@
   SSL_CTX* 	ssl_ctx;	/* SSL context 	*/
   SSL_METHOD* 	ssl_mt;		/* SSL method   */
   SSL* 		ssl;		/* SSL handler  */
-  int		last_ssl_err;	/* Last SSL error code */
 #endif
  pid_t		pid;		/* Owner - for debugging only */
 
@@ -585,7 +584,7 @@
       if (ret > 0)
 	return ret;
 
-      fp->last_ssl_err = err = SSL_get_error(fp->ssl, ret);
+      err = SSL_get_error(fp->ssl, ret);
       FD_ZERO(&fdr); FD_ZERO(&fdw);
       switch (err)
     {
@@ -1279,7 +1278,7 @@
 	    count += ret;
 	  else
 	    {
-	      fp->last_ssl_err = err = SSL_get_error(fp->ssl, ret);
+	      err = SSL_get_error(fp->ssl, ret);
 	      FD_ZERO(&fdw); FD_ZERO(&fdr); 
 	      if (err == SSL_ERROR_WANT_WRITE)
 		{