[dovecot-cvs] dovecot/src/login auth-connection.c,1.22,1.23 client-authenticate.c,1.34,1.35 client.c,1.29,1.30 client.h,1.14,1.15 main.c,1.15,1.16 master.c,1.13,1.14 ssl-proxy-gnutls.c,1.4,1.5

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/login
In directory danu:/tmp/cvs-serv23816/login

Modified Files:
	auth-connection.c client-authenticate.c client.c client.h 
	main.c master.c ssl-proxy-gnutls.c 
Log Message:
Removed useless parameters from io_callback_t and timeout_callback_t.



Index: auth-connection.c
===================================================================
RCS file: /home/cvs/dovecot/src/login/auth-connection.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- auth-connection.c	27 Jan 2003 01:33:40 -0000	1.22
+++ auth-connection.c	27 Jan 2003 01:44:34 -0000	1.23
@@ -27,7 +27,7 @@
 static struct timeout *to;
 
 static void auth_connection_destroy(struct auth_connection *conn);
-static void auth_input(void *context, int fd, struct io *io);
+static void auth_input(void *context);
 static void auth_connect_missing(void);
 
 static struct auth_connection *auth_connection_find(const char *path)
@@ -190,8 +190,7 @@
 		request_destroy(request);
 }
 
-static void auth_input(void *context, int fd __attr_unused__,
-		       struct io *io __attr_unused__)
+static void auth_input(void *context)
 {
 	struct auth_connection *conn = context;
         struct auth_login_handshake_output handshake;
@@ -345,8 +344,7 @@
 }
 
 static void
-auth_connect_missing_timeout(void *context __attr_unused__,
-			     struct timeout *timeout __attr_unused__)
+auth_connect_missing_timeout(void *context __attr_unused__)
 {
 	if (auth_reconnect)
                 auth_connect_missing();

Index: client-authenticate.c
===================================================================
RCS file: /home/cvs/dovecot/src/login/client-authenticate.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- client-authenticate.c	27 Jan 2003 01:33:40 -0000	1.34
+++ client-authenticate.c	27 Jan 2003 01:44:34 -0000	1.35
@@ -256,8 +256,7 @@
 		client_send_auth_data(client, data, reply->data_size);
 }
 
-static void client_auth_input(void *context, int fd __attr_unused__,
-			      struct io *io __attr_unused__)
+static void client_auth_input(void *context)
 {
 	struct client *client = context;
 	buffer_t *buf;

Index: client.c
===================================================================
RCS file: /home/cvs/dovecot/src/login/client.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- client.c	21 Jan 2003 11:17:44 -0000	1.29
+++ client.c	27 Jan 2003 01:44:34 -0000	1.30
@@ -245,8 +245,7 @@
 	}
 }
 
-void client_input(void *context, int fd __attr_unused__,
-		  struct io *io __attr_unused__)
+void client_input(void *context)
 {
 	struct client *client = context;
 
@@ -422,8 +421,7 @@
 	}
 }
 
-static void idle_timeout(void *context __attr_unused__,
-			 struct timeout *timeout __attr_unused__)
+static void idle_timeout(void *context __attr_unused__)
 {
 	hash_foreach(clients, client_hash_check_idle, NULL);
 }

Index: client.h
===================================================================
RCS file: /home/cvs/dovecot/src/login/client.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- client.h	27 Jan 2003 01:33:40 -0000	1.14
+++ client.h	27 Jan 2003 01:44:34 -0000	1.15
@@ -42,7 +42,7 @@
 void client_syslog(struct client *client, const char *text);
 
 int client_read(struct client *client);
-void client_input(void *context, int fd, struct io *io);
+void client_input(void *context);
 
 unsigned int clients_get_count(void);
 void clients_destroy_all(void);

Index: main.c
===================================================================
RCS file: /home/cvs/dovecot/src/login/main.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- main.c	8 Jan 2003 21:13:05 -0000	1.15
+++ main.c	27 Jan 2003 01:44:34 -0000	1.16
@@ -71,13 +71,12 @@
 	io_loop_stop(ioloop);
 }
 
-static void login_accept(void *context __attr_unused__, int listen_fd,
-			 struct io *io __attr_unused__)
+static void login_accept(void *context __attr_unused__)
 {
 	struct ip_addr ip;
 	int fd;
 
-	fd = net_accept(listen_fd, &ip, NULL);
+	fd = net_accept(LOGIN_IMAP_LISTEN_FD, &ip, NULL);
 	if (fd < 0) {
 		if (fd < -1)
 			i_fatal("accept() failed: %m");
@@ -90,14 +89,13 @@
 	(void)client_create(fd, &ip, FALSE);
 }
 
-static void login_accept_ssl(void *context __attr_unused__, int listen_fd,
-			     struct io *io __attr_unused__)
+static void login_accept_ssl(void *context __attr_unused__)
 {
 	struct client *client;
 	struct ip_addr addr;
 	int fd, fd_ssl;
 
-	fd = net_accept(listen_fd, &addr, NULL);
+	fd = net_accept(LOGIN_IMAPS_LISTEN_FD, &addr, NULL);
 	if (fd < 0) {
 		if (fd < -1)
 			i_fatal("accept() failed: %m");

Index: master.c
===================================================================
RCS file: /home/cvs/dovecot/src/login/master.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- master.c	27 Jan 2003 01:33:40 -0000	1.13
+++ master.c	27 Jan 2003 01:44:34 -0000	1.14
@@ -80,12 +80,11 @@
 	main_unref();
 }
 
-static void master_input(void *context __attr_unused__, int fd,
-			 struct io *io __attr_unused__)
+static void master_input(void *context __attr_unused__)
 {
 	int ret;
 
-	ret = net_receive(fd, master_buf + master_pos,
+	ret = net_receive(LOGIN_MASTER_SOCKET_FD, master_buf + master_pos,
 			  sizeof(master_buf) - master_pos);
 	if (ret < 0) {
 		/* master died, kill all clients logging in */

Index: ssl-proxy-gnutls.c
===================================================================
RCS file: /home/cvs/dovecot/src/login/ssl-proxy-gnutls.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ssl-proxy-gnutls.c	5 Jan 2003 13:09:53 -0000	1.4
+++ ssl-proxy-gnutls.c	27 Jan 2003 01:44:34 -0000	1.5
@@ -46,8 +46,8 @@
 static gnutls_dh_params dh_params;
 static gnutls_rsa_params rsa_params;
 
-static void ssl_input(void *context, int handle, struct io *io);
-static void plain_input(void *context, int handle, struct io *io);
+static void ssl_input(void *context);
+static void plain_input(void *context);
 static int ssl_proxy_destroy(struct ssl_proxy *proxy);
 
 static const char *get_alert_text(struct ssl_proxy *proxy)
@@ -138,8 +138,7 @@
 	return FALSE;
 }
 
-static void ssl_output(void *context, int fd __attr_unused__,
-		       struct io *io __attr_unused__)
+static void ssl_output(void *context)
 {
         struct ssl_proxy *proxy = context;
 	int sent;
@@ -164,8 +163,7 @@
 	proxy->io_ssl = io_add(proxy->fd_ssl, IO_READ, ssl_input, proxy);
 }
 
-static void ssl_input(void *context, int fd __attr_unused__,
-		      struct io *io __attr_unused__)
+static void ssl_input(void *context)
 {
         struct ssl_proxy *proxy = context;
 	int rcvd, sent;
@@ -194,8 +192,7 @@
 	proxy->io_ssl = io_add(proxy->fd_ssl, IO_WRITE, ssl_output, proxy);
 }
 
-static void plain_output(void *context, int fd __attr_unused__,
-			 struct io *io __attr_unused__)
+static void plain_output(void *context)
 {
 	struct ssl_proxy *proxy = context;
 	int sent;
@@ -213,8 +210,7 @@
 	proxy->io_plain = io_add(proxy->fd_plain, IO_READ, plain_input, proxy);
 }
 
-static void plain_input(void *context, int fd __attr_unused__,
-			struct io *io __attr_unused__)
+static void plain_input(void *context)
 {
 	struct ssl_proxy *proxy = context;
 	char buf[1024];
@@ -240,8 +236,7 @@
 	proxy->io_plain = io_add(proxy->fd_ssl, IO_WRITE, plain_output, proxy);
 }
 
-static void ssl_handshake(void *context, int fd __attr_unused__,
-			  struct io *io __attr_unused__)
+static void ssl_handshake(void *context)
 {
 	struct ssl_proxy *proxy = context;
 	int ret, dir;
@@ -319,7 +314,7 @@
 	proxy->fd_plain = sfd[0];
 
 	proxy->refcount++;
-	ssl_handshake(proxy, -1, NULL);
+	ssl_handshake(proxy);
 	if (!ssl_proxy_destroy(proxy))
 		return -1;