update source to use our brand new source generator. Update automakes.

[apps/madmutt.git] / lib-sys / mutt_socket.h

diff --git a/lib-sys/mutt_socket.h b/lib-sys/mutt_socket.h
index 9369b2a..25ad7c0 100644 (file)
--- a/lib-sys/mutt_socket.h
+++ b/lib-sys/mutt_socket.h
@@ -34,23 +34,20 @@ typedef struct _connection {
   struct _connection *next;
 
   void *sockdata;
-  int (*conn_read) (struct _connection * conn, char *buf, size_t len);
+  int (*conn_read) (struct _connection * conn, char *buf, ssize_t len);
   int (*conn_write) (struct _connection * conn, const char *buf,
-                     size_t count);
+                     ssize_t count);
   int (*conn_open) (struct _connection * conn);
   int (*conn_close) (struct _connection * conn);
 } CONNECTION;
 
 int mutt_socket_open (CONNECTION * conn);
 int mutt_socket_close (CONNECTION * conn);
-int mutt_socket_read (CONNECTION * conn, char *buf, size_t len);
+int mutt_socket_read (CONNECTION * conn, char *buf, ssize_t len);
 int mutt_socket_readchar (CONNECTION * conn, char *c);
 
-#define mutt_socket_readln(A,B,C) mutt_socket_readln_d(A,B,C,M_SOCK_LOG_CMD)
-int mutt_socket_readln_d (char *buf, ssize_t buflen, CONNECTION * conn,
-                          int dbg);
-#define mutt_socket_write(A,B) mutt_socket_write_d(A,B,M_SOCK_LOG_CMD);
-int mutt_socket_write_d (CONNECTION * conn, const char *buf, int dbg);
+int mutt_socket_readln(char *buf, ssize_t buflen, CONNECTION * conn);
+int mutt_socket_write(CONNECTION * conn, const char *buf);
 
 /* stupid hack for imap_logout_all */
 CONNECTION *mutt_socket_head (void);
@@ -58,8 +55,8 @@ void mutt_socket_free (CONNECTION * conn);
 CONNECTION *mutt_conn_find (const CONNECTION * start,
                             const ACCOUNT * account);
 
-int raw_socket_read (CONNECTION * conn, char *buf, size_t len);
-int raw_socket_write (CONNECTION * conn, const char *buf, size_t count);
+int raw_socket_read (CONNECTION * conn, char *buf, ssize_t len);
+int raw_socket_write (CONNECTION * conn, const char *buf, ssize_t count);
 int raw_socket_open (CONNECTION * conn);
 int raw_socket_close (CONNECTION * conn);