[dovecot-cvs] dovecot/src/auth login-connection.c,1.7,1.8 master.c,1.6,1.7 userinfo-passwd-file.c,1.12,1.13

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/auth
In directory danu:/tmp/cvs-serv6082/auth

Modified Files:
	login-connection.c master.c userinfo-passwd-file.c 
Log Message:
Renamed IBuffer and OBuffer to IStream and OStream which describes their
functionality better. I tried to keep the variable names and comments also
sensible.



Index: login-connection.c
===================================================================
RCS file: /home/cvs/dovecot/src/auth/login-connection.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- login-connection.c	6 Nov 2002 06:00:58 -0000	1.7
+++ login-connection.c	6 Dec 2002 01:09:22 -0000	1.8
@@ -2,8 +2,8 @@
 
 #include "common.h"
 #include "ioloop.h"
-#include "ibuffer.h"
-#include "obuffer.h"
+#include "istream.h"
+#include "ostream.h"
 #include "network.h"
 #include "login-connection.h"
 
@@ -20,8 +20,8 @@
 
 	int fd;
 	IO io;
-	IBuffer *inbuf;
-	OBuffer *outbuf;
+	IStream *input;
+	OStream *output;
         AuthRequestType type;
 };
 
@@ -35,10 +35,10 @@
 
 	i_assert(reply->data_size <= AUTH_MAX_REPLY_DATA_SIZE);
 
-	if (o_buffer_send(conn->outbuf, reply, sizeof(AuthReplyData)) < 0)
+	if (o_stream_send(conn->output, reply, sizeof(AuthReplyData)) < 0)
 		login_connection_destroy(conn);
 	else if (reply->data_size > 0) {
-		if (o_buffer_send(conn->outbuf, data, reply->data_size) < 0)
+		if (o_stream_send(conn->output, data, reply->data_size) < 0)
 			login_connection_destroy(conn);
 	}
 }
@@ -50,7 +50,7 @@
         unsigned char *data;
 	size_t size;
 
-	switch (i_buffer_read(conn->inbuf)) {
+	switch (i_stream_read(conn->input)) {
 	case 0:
 		return;
 	case -1:
@@ -65,7 +65,7 @@
 		return;
 	}
 
-	data = i_buffer_get_modifyable_data(conn->inbuf, &size);
+	data = i_stream_get_modifyable_data(conn->input, &size);
 	if (size < sizeof(AuthRequestType))
 		return;
 
@@ -83,7 +83,7 @@
 			return;
 
 		memcpy(&request, data, sizeof(request));
-		i_buffer_skip(conn->inbuf, sizeof(request));
+		i_stream_skip(conn->input, sizeof(request));
 
 		/* we have a full init request */
 		auth_init_request(&request, request_callback, conn);
@@ -98,7 +98,7 @@
 		if (size < sizeof(request) + request.data_size)
 			return;
 
-		i_buffer_skip(conn->inbuf, sizeof(request) + request.data_size);
+		i_stream_skip(conn->input, sizeof(request) + request.data_size);
 
 		/* we have a full continued request */
 		auth_continue_request(&request, data + sizeof(request),
@@ -122,9 +122,9 @@
 	conn = i_new(LoginConnection, 1);
 
 	conn->fd = fd;
-	conn->inbuf = i_buffer_create_file(fd, default_pool, MAX_INBUF_SIZE,
+	conn->input = i_stream_create_file(fd, default_pool, MAX_INBUF_SIZE,
 					   FALSE);
-	conn->outbuf = o_buffer_create_file(fd, default_pool, MAX_OUTBUF_SIZE,
+	conn->output = o_stream_create_file(fd, default_pool, MAX_OUTBUF_SIZE,
 					    IO_PRIORITY_DEFAULT, FALSE);
 	conn->io = io_add(fd, IO_READ, login_input, conn);
 	conn->type = AUTH_REQUEST_NONE;
@@ -132,7 +132,7 @@
 	conn->next = connections;
 	connections = conn;
 
-	if (o_buffer_send(conn->outbuf, &auth_init_data,
+	if (o_stream_send(conn->output, &auth_init_data,
 			  sizeof(auth_init_data)) < 0) {
 		login_connection_destroy(conn);
 		conn = NULL;
@@ -152,8 +152,8 @@
 		}
 	}
 
-	i_buffer_unref(conn->inbuf);
-	o_buffer_unref(conn->outbuf);
+	i_stream_unref(conn->input);
+	o_stream_unref(conn->output);
 
 	io_remove(conn->io);
 	net_disconnect(conn->fd);

Index: master.c
===================================================================
RCS file: /home/cvs/dovecot/src/auth/master.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- master.c	26 Nov 2002 20:04:08 -0000	1.6
+++ master.c	6 Dec 2002 01:09:22 -0000	1.7
@@ -2,7 +2,7 @@
 
 #include "common.h"
 #include "ioloop.h"
-#include "obuffer.h"
+#include "ostream.h"
 #include "network.h"
 #include "cookie.h"
 #include "master.h"
@@ -11,7 +11,7 @@
 
 static AuthCookieReplyData failure_reply;
 
-static OBuffer *outbuf;
+static OStream *output;
 static IO io_master;
 
 static unsigned int master_pos;
@@ -35,7 +35,7 @@
 	}
 
 	reply->id = request->id;
-	switch (o_buffer_send(outbuf, reply, sizeof(AuthCookieReplyData))) {
+	switch (o_stream_send(output, reply, sizeof(AuthCookieReplyData))) {
 	case -2:
 		i_fatal("Master transmit buffer full, aborting");
 	case -1:
@@ -72,7 +72,7 @@
 	memset(&failure_reply, 0, sizeof(failure_reply));
 
 	master_pos = 0;
-	outbuf = o_buffer_create_file(MASTER_SOCKET_FD, default_pool,
+	output = o_stream_create_file(MASTER_SOCKET_FD, default_pool,
 				      MAX_OUTBUF_SIZE, IO_PRIORITY_DEFAULT,
 				      FALSE);
 	io_master = io_add(MASTER_SOCKET_FD, IO_READ, master_input, NULL);
@@ -80,6 +80,6 @@
 
 void master_deinit(void)
 {
-	o_buffer_unref(outbuf);
+	o_stream_unref(output);
 	io_remove(io_master);
 }

Index: userinfo-passwd-file.c
===================================================================
RCS file: /home/cvs/dovecot/src/auth/userinfo-passwd-file.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- userinfo-passwd-file.c	26 Nov 2002 17:56:14 -0000	1.12
+++ userinfo-passwd-file.c	6 Dec 2002 01:09:22 -0000	1.13
@@ -7,7 +7,7 @@
 
 #include "userinfo-passwd.h"
 
-#include "ibuffer.h"
+#include "istream.h"
 #include "hash.h"
 #include "hex-binary.h"
 #include "md5.h"
@@ -295,15 +295,15 @@
 
 static void passwd_file_parse_file(PasswdFile *pw)
 {
-	IBuffer *inbuf;
+	IStream *input;
 	char *const *args;
 	char *line;
 
-	inbuf = i_buffer_create_file(pw->fd, default_pool, 2048, FALSE);
+	input = i_stream_create_file(pw->fd, default_pool, 2048, FALSE);
 	for (;;) {
-		line = i_buffer_next_line(inbuf);
+		line = i_stream_next_line(input);
 		if (line == NULL) {
-			if (i_buffer_read(inbuf) <= 0)
+			if (i_stream_read(input) <= 0)
 				break;
                         continue;
 		}
@@ -319,7 +319,7 @@
 		}
 		t_pop();
 	}
-	i_buffer_unref(inbuf);
+	i_stream_unref(input);
 }
 
 static PasswdFile *passwd_file_parse(const char *path)