projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From: Alain Bench <messtic@oreka.com>
[apps/madmutt.git]
/
mutt_socket.c
diff --git
a/mutt_socket.c
b/mutt_socket.c
index
6cccc7a
..
94dbfc5
100644
(file)
--- a/
mutt_socket.c
+++ b/
mutt_socket.c
@@
-189,7
+189,7
@@
void mutt_socket_free (CONNECTION * conn)
/* head is special case, doesn't need prev updated */
if (iter == conn) {
Connections = iter->next;
/* head is special case, doesn't need prev updated */
if (iter == conn) {
Connections = iter->next;
-
FREE
(&iter);
+
mem_free
(&iter);
return;
}
return;
}
@@
-197,7
+197,7
@@
void mutt_socket_free (CONNECTION * conn)
if (iter->next == conn) {
tmp = iter->next;
iter->next = tmp->next;
if (iter->next == conn) {
tmp = iter->next;
iter->next = tmp->next;
-
FREE
(&tmp);
+
mem_free
(&tmp);
return;
}
iter = iter->next;
return;
}
iter = iter->next;
@@
-326,7
+326,7
@@
static CONNECTION *socket_new_conn (void)
{
CONNECTION *conn;
{
CONNECTION *conn;
- conn = (CONNECTION *)
safe
_calloc (1, sizeof (CONNECTION));
+ conn = (CONNECTION *)
mem
_calloc (1, sizeof (CONNECTION));
conn->fd = -1;
return conn;
conn->fd = -1;
return conn;
@@
-406,11
+406,12
@@
int raw_socket_open (CONNECTION * conn)
rc = getaddrinfo (host_idna, port, &hints, &res);
# ifdef HAVE_LIBIDN
rc = getaddrinfo (host_idna, port, &hints, &res);
# ifdef HAVE_LIBIDN
-
FREE
(&host_idna);
+
mem_free
(&host_idna);
# endif
if (rc) {
mutt_error (_("Could not find the host \"%s\""), conn->account.host);
# endif
if (rc) {
mutt_error (_("Could not find the host \"%s\""), conn->account.host);
+ mutt_sleep (2);
return -1;
}
return -1;
}
@@
-456,7
+457,7
@@
int raw_socket_open (CONNECTION * conn)
if ((he = gethostbyname (host_idna)) == NULL) {
# ifdef HAVE_LIBIDN
if ((he = gethostbyname (host_idna)) == NULL) {
# ifdef HAVE_LIBIDN
-
FREE
(&host_idna);
+
mem_free
(&host_idna);
# endif
mutt_error (_("Could not find the host \"%s\""), conn->account.host);
# endif
mutt_error (_("Could not find the host \"%s\""), conn->account.host);
@@
-464,7
+465,7
@@
int raw_socket_open (CONNECTION * conn)
}
# ifdef HAVE_LIBIDN
}
# ifdef HAVE_LIBIDN
-
FREE
(&host_idna);
+
mem_free
(&host_idna);
# endif
mutt_message (_("Connecting to %s..."), conn->account.host);
# endif
mutt_message (_("Connecting to %s..."), conn->account.host);