Rocco Rutte:

[apps/madmutt.git] / mutt_socket.c

diff --git a/mutt_socket.c b/mutt_socket.c
index 2cdbf25..acb544a 100644 (file)
--- a/mutt_socket.c
+++ b/mutt_socket.c
@@ -17,7 +17,7 @@
 #include "globals.h"
 #include "mutt_socket.h"
 #include "mutt_tunnel.h"
-#if defined(USE_SSL) || defined(USE_GNUTLS) || defined(USE_NSS)
+#if defined(USE_SSL) || defined(USE_GNUTLS)
 # include "mutt_ssl.h"
 #endif
 
@@ -44,7 +44,7 @@ static CONNECTION *Connections = NULL;
 /* forward declarations */
 static int socket_preconnect (void);
 static int socket_connect (int fd, struct sockaddr *sa);
-static CONNECTION *socket_new_conn ();
+static CONNECTION *socket_new_conn (void);
 
 /* Wrappers */
 int mutt_socket_open (CONNECTION * conn)
@@ -103,7 +103,7 @@ int mutt_socket_write_d (CONNECTION * conn, const char *buf, int dbg)
     return -1;
   }
 
-  len = safe_strlen (buf);
+  len = mutt_strlen (buf);
   if ((rc = conn->conn_write (conn, buf, len)) < 0) {
     debug_print (1, ("error writing, closing socket\n"));
     mutt_socket_close (conn);
@@ -169,7 +169,7 @@ int mutt_socket_readln_d (char *buf, size_t buflen, CONNECTION * conn,
 
   debug_print (dbg, ("< %s\n", buf));
 
-  /* number of bytes read, not safe_strlen */
+  /* number of bytes read, not mutt_strlen */
   return i + 1;
 }
 
@@ -239,8 +239,6 @@ CONNECTION *mutt_conn_find (const CONNECTION * start, const ACCOUNT * account)
   else if (account->flags & M_ACCT_SSL) {
 #ifdef USE_SSL
     ssl_socket_setup (conn);
-#elif USE_NSS
-    mutt_nss_socket_setup (conn);
 #elif USE_GNUTLS
     if (mutt_gnutls_socket_setup (conn) < 0) {
       mutt_socket_free (conn);
@@ -270,7 +268,7 @@ static int socket_preconnect (void)
   int rc;
   int save_errno;
 
-  if (safe_strlen (Preconnect)) {
+  if (mutt_strlen (Preconnect)) {
     debug_print (2, ("Executing preconnect: %s\n", Preconnect));
     rc = mutt_system (Preconnect);
     debug_print (2, ("Preconnect result: %d\n", rc));
@@ -324,7 +322,7 @@ static int socket_connect (int fd, struct sockaddr *sa)
 }
 
 /* socket_new_conn: allocate and initialise a new connection. */
-static CONNECTION *socket_new_conn ()
+static CONNECTION *socket_new_conn (void)
 {
   CONNECTION *conn;