#endif
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "globals.h"
#include "mutt_idna.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <unistd.h>
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);
debug_print (dbg, ("< %s\n", buf));
- /* number of bytes read, not str_len */
+ /* number of bytes read, not m_strlen*/
return i + 1;
}
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));
struct addrinfo *cur;
/* we accept v4 or v6 STREAM sockets */
- memset (&hints, 0, sizeof (hints));
+ p_clear(&hints, 1);
if (option (OPTUSEIPV6))
hints.ai_family = AF_UNSPEC;
struct hostent *he;
int i;
- memset (&sin, 0, sizeof (sin));
+ p_clear(&sin, 1);
sin.sin_port = htons (conn->account.port);
sin.sin_family = AF_INET;