projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Patch from Julien danjou: fix a couple of compilation warnings.
[apps/madmutt.git]
/
mutt_tunnel.c
diff --git
a/mutt_tunnel.c
b/mutt_tunnel.c
index
db5f50e
..
92fcea5
100644
(file)
--- a/
mutt_tunnel.c
+++ b/
mutt_tunnel.c
@@
-12,13
+12,14
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
#include "mutt_socket.h"
#include "mutt_tunnel.h"
#include "mutt.h"
#include "mutt_socket.h"
#include "mutt_tunnel.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include <netinet/in.h>
#include <sys/types.h>
#include <netinet/in.h>
#include <sys/types.h>
@@
-59,7
+60,7
@@
static int tunnel_socket_open (CONNECTION * conn)
int rc;
int pin[2], pout[2];
int rc;
int pin[2], pout[2];
- tunnel =
(TUNNEL_DATA *) safe_malloc (sizeof (TUNNEL_DATA)
);
+ tunnel =
p_new(TUNNEL_DATA, 1
);
conn->sockdata = tunnel;
mutt_message (_("Connecting with \"%s\"..."), Tunnel);
conn->sockdata = tunnel;
mutt_message (_("Connecting with \"%s\"..."), Tunnel);
@@
-129,7
+130,7
@@
static int tunnel_socket_close (CONNECTION * conn)
NONULL(mutt_strsysexit(WEXITSTATUS(status))));
mutt_sleep (2);
}
NONULL(mutt_strsysexit(WEXITSTATUS(status))));
mutt_sleep (2);
}
-
FREE
(&conn->sockdata);
+
p_delete
(&conn->sockdata);
return 0;
}
return 0;
}