Fix multiple compilation warnings

[apps/madmutt.git] / mutt_sasl.h

diff --git a/mutt_sasl.h b/mutt_sasl.h
index 5286af1..b34b7c1 100644 (file)
--- a/mutt_sasl.h
+++ b/mutt_sasl.h
@@ -12,18 +12,15 @@
 #ifndef _MUTT_SASL_H_
 #define _MUTT_SASL_H_ 1
 
-#ifdef USE_SASL2
 #include <sasl/sasl.h>
-#else
-#include <sasl.h>
-#endif
 
-#include "mutt_socket.h"
+#include <lib-sys/mutt_socket.h>
 
 int mutt_sasl_client_new (CONNECTION *, sasl_conn_t **);
 sasl_callback_t *mutt_sasl_get_callbacks (ACCOUNT *);
 int mutt_sasl_interact (sasl_interact_t *);
 void mutt_sasl_setup_conn (CONNECTION *, sasl_conn_t *);
+void mutt_sasl_done (void);
 
 typedef struct {
   sasl_conn_t *saslconn;
@@ -31,20 +28,16 @@ typedef struct {
   const unsigned int *pbufsize;
 
   /* read buffer */
-#ifdef USE_SASL2
   const char *buf;
-#else
-  char *buf;
-#endif
-  unsigned int blen;
+  unsigned blen;
   unsigned int bpos;
 
   /* underlying socket data */
   void *sockdata;
   int (*msasl_open) (CONNECTION * conn);
   int (*msasl_close) (CONNECTION * conn);
-  int (*msasl_read) (CONNECTION * conn, char *buf, size_t len);
-  int (*msasl_write) (CONNECTION * conn, const char *buf, size_t count);
+  int (*msasl_read) (CONNECTION * conn, char *buf, ssize_t len);
+  int (*msasl_write) (CONNECTION * conn, const char *buf, ssize_t count);
 } SASL_DATA;
 
 #endif /* _MUTT_SASL_H_ */