X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_socket.c;h=2c49da9a6dfe29a300d1e452b1c9b9765e10e9fd;hp=1a02f245067a29f85fc1ede2e318ad25bc46a4d2;hb=7f7a0be369840b290248e5b0302beb447fa1b3cd;hpb=9a1efcc01ddeca4106847f8eb28a704aca2dcf0b

diff --git a/mutt_socket.c b/mutt_socket.c
index 1a02f24..2c49da9 100644
--- a/mutt_socket.c
+++ b/mutt_socket.c
@@ -14,6 +14,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 
 #include "mutt.h"
@@ -26,7 +27,6 @@
 
 #include "mutt_idna.h"
 
-#include "lib/str.h"
 #include "lib/debug.h"
 
 #include <unistd.h>
@@ -104,7 +104,7 @@ int mutt_socket_write_d (CONNECTION * conn, const char *buf, int dbg)
     return -1;
   }
 
-  len = str_len (buf);
+  len = m_strlen(buf);
   if ((rc = conn->conn_write (conn, buf, len)) < 0) {
     debug_print (1, ("error writing, closing socket\n"));
     mutt_socket_close (conn);
@@ -170,7 +170,7 @@ int mutt_socket_readln_d (char *buf, size_t buflen, CONNECTION * conn,
 
   debug_print (dbg, ("< %s\n", buf));
 
-  /* number of bytes read, not str_len */
+  /* number of bytes read, not m_strlen*/
   return i + 1;
 }
 
@@ -267,7 +267,7 @@ static int socket_preconnect (void)
   int rc;
   int save_errno;
 
-  if (str_len (Preconnect)) {
+  if (m_strlen(Preconnect)) {
     debug_print (2, ("Executing preconnect: %s\n", Preconnect));
     rc = mutt_system (Preconnect);
     debug_print (2, ("Preconnect result: %d\n", rc));