conn: don't try to determine buffer size if length was negative

It's caller's responsibility to pass the correct buffer size.

diff --git a/conn/socket.c b/conn/socket.c
index 1cc5f154a38f0e5f4cdf0bf381398a71e0e78547..ca99d7bf494a7262541758cea96ddad2ca1e625d 100644 (file)
--- a/conn/socket.c
+++ b/conn/socket.c
@@ -220,9 +220,6 @@ int mutt_socket_write_d(struct Connection *conn, const char *buf, int len, int d
     return -1;
   }
 
-  if (len < 0)
-    len = mutt_str_strlen(buf);
-
   while (sent < len)
   {
     const int rc = conn->conn_write(conn, buf + sent, len - sent);

diff --git a/mutt_socket.h b/mutt_socket.h
index 048ba97595c621fbbe4ad82bbe41702ab6e9129a..1e7f3df287c8cafb38a8c2c199a9dce4c214c485 100644 (file)
--- a/mutt_socket.h
+++ b/mutt_socket.h
@@ -46,7 +46,7 @@ struct Connection *mutt_conn_find(const struct Connection *start, const struct A
 
 #define mutt_socket_readln(A, B, C)  mutt_socket_readln_d(A, B, C, MUTT_SOCK_LOG_CMD)
 #define mutt_socket_send(conn, buffer)           mutt_socket_send_d(conn, buffer, MUTT_SOCK_LOG_CMD)
-#define mutt_socket_send_d(conn, buffer, level)  mutt_socket_write_d(conn, buffer, -1, level)
+#define mutt_socket_send_d(conn, buffer, level)  mutt_socket_write_d(conn, buffer, mutt_str_strlen(buffer), level)
 #define mutt_socket_write_n(A, B, C) mutt_socket_write_d(A, B, C, MUTT_SOCK_LOG_CMD)
 
 #endif /* _MUTT_SOCKET_H */