X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_sasl.c;h=d904164d1fa16220bb741f47e468216f3bcac50f;hp=699e67705949cb40a90e3b49666c5ef80a2a3a81;hb=711f787502b6a1a1c150b948a5ed9156c8ef9ba1;hpb=9274cbe8e6410ddb95ddc667faa678a29da85420

diff --git a/mutt_sasl.c b/mutt_sasl.c
index 699e677..d904164 100644
--- a/mutt_sasl.c
+++ b/mutt_sasl.c
@@ -13,22 +13,20 @@
 # include "config.h"
 #endif
 
-#include <lib-lib/mem.h>
-
-#include "mutt.h"
-#include "account.h"
-#include "mutt_sasl.h"
-#include "mutt_socket.h"
-
-#include "lib/debug.h"
-
 #include <errno.h>
 #include <netdb.h>
 #include <sasl/sasl.h>
-
 #include <sys/socket.h>
 #include <netinet/in.h>
 
+#include <lib-lib/mem.h>
+#include <lib-lib/debug.h>
+
+#include "mutt.h"
+#include "account.h"
+#include "mutt_sasl.h"
+#include <lib-sys/mutt_socket.h>
+
 static int getnameinfo_err (int ret)
 {
   int err;
@@ -93,9 +91,9 @@ static int mutt_sasl_cb_pass (sasl_conn_t * conn, void *context, int id,
 /* socket wrappers for a SASL security layer */
 static int mutt_sasl_conn_open (CONNECTION * conn);
 static int mutt_sasl_conn_close (CONNECTION * conn);
-static int mutt_sasl_conn_read (CONNECTION * conn, char *buf, size_t len);
+static int mutt_sasl_conn_read (CONNECTION * conn, char *buf, ssize_t len);
 static int mutt_sasl_conn_write (CONNECTION * conn, const char *buf,
-                                 size_t count);
+                                 ssize_t count);
 
 /* utility function, stolen from sasl2 sample code */
 static int iptostring (const struct sockaddr *addr, socklen_t addrlen,
@@ -502,7 +500,7 @@ static int mutt_sasl_conn_close (CONNECTION * conn)
   return rc;
 }
 
-static int mutt_sasl_conn_read (CONNECTION * conn, char *buf, size_t len)
+static int mutt_sasl_conn_read (CONNECTION * conn, char *buf, ssize_t len)
 {
   SASL_DATA *sasldata;
   int rc;
@@ -564,7 +562,7 @@ out:
 }
 
 static int mutt_sasl_conn_write (CONNECTION * conn, const char *buf,
-                                 size_t len)
+                                 ssize_t len)
 {
   SASL_DATA *sasldata;
   int rc;