[dovecot-cvs] dovecot/src/lib ibuffer-file.c,1.6,1.7 obuffer-file.c,1.12,1.13

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib
In directory danu:/tmp/cvs-serv27304

Modified Files:
	ibuffer-file.c obuffer-file.c 
Log Message:
If timeout wasn't set, it was assumed that it was immediate.



Index: ibuffer-file.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib/ibuffer-file.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ibuffer-file.c	28 Oct 2002 04:33:00 -0000	1.6
+++ ibuffer-file.c	29 Oct 2002 17:40:33 -0000	1.7
@@ -162,7 +162,7 @@
 
 	ret = -1;
 	do {
-		if (ret == 0 && time(NULL) > timeout_time) {
+		if (ret == 0 && timeout_time > 0 && time(NULL) > timeout_time) {
 			/* timeouted */
 			if (fbuf->timeout_func != NULL)
 				fbuf->timeout_func(fbuf->timeout_context);

Index: obuffer-file.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib/obuffer-file.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- obuffer-file.c	28 Oct 2002 04:21:15 -0000	1.12
+++ obuffer-file.c	29 Oct 2002 17:40:33 -0000	1.13
@@ -258,7 +258,7 @@
 	while (iov[iov_len-1].iov_len != 0) {
 		if (first)
 			first = FALSE;
-		else if (time(NULL) > timeout_time) {
+		else if (timeout_time > 0 && time(NULL) > timeout_time) {
 			/* timeouted */
 			if (fbuf->timeout_func != NULL)
 				fbuf->timeout_func(fbuf->timeout_context);
@@ -524,7 +524,7 @@
 	for (;;) {
 		if (first)
 			first = FALSE;
-		else if (time(NULL) > timeout_time) {
+		else if (timeout_time > 0 && time(NULL) > timeout_time) {
 			/* timeouted */
 			if (foutbuf->timeout_func != NULL)
 				foutbuf->timeout_func(foutbuf->timeout_context);
@@ -607,7 +607,7 @@
 			break;
 		}
 
-		if (time(NULL) > timeout_time) {
+		if (timeout_time > 0 && time(NULL) > timeout_time) {
 			/* timeouted */
 			if (foutbuf->timeout_func != NULL)
 				foutbuf->timeout_func(foutbuf->timeout_context);