dovecot-2.2: dict memcached-ascii bugfixes

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/f5dc8abad16b
changeset: 14907:f5dc8abad16b
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Aug 16 05:41:57 2012 +0300
description:
dict memcached-ascii bugfixes

diffstat:

 src/lib-dict/dict-memcached-ascii.c |  12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diffs (36 lines):

diff -r 96a9a086c052 -r f5dc8abad16b src/lib-dict/dict-memcached-ascii.c
--- a/src/lib-dict/dict-memcached-ascii.c	Wed Aug 15 16:56:17 2012 +0300
+++ b/src/lib-dict/dict-memcached-ascii.c	Thu Aug 16 05:41:57 2012 +0300
@@ -197,6 +197,7 @@
 {
 	struct memcached_ascii_connection *conn =
 		(struct memcached_ascii_connection *)_conn;
+	int ret;
 
 	switch (i_stream_read(_conn->input)) {
 	case 0:
@@ -208,12 +209,9 @@
 		break;
 	}
 
-	while (array_count(&conn->dict->input_states) > 0) {
-		if (memcached_ascii_input_reply(conn->dict) < 0) {
-			memcached_ascii_conn_destroy(_conn);
-			break;
-		}
-	}
+	while ((ret = memcached_ascii_input_reply(conn->dict)) > 0) ;
+	if (ret < 0)
+		memcached_ascii_conn_destroy(_conn);
 	io_loop_stop(conn->dict->ioloop);
 }
 
@@ -244,7 +242,7 @@
 
 static int memcached_ascii_wait_replies(struct memcached_ascii_dict *dict)
 {
-	int ret;
+	int ret = 0;
 
 	dict->to = timeout_add(dict->timeout_msecs,
 			       memcached_ascii_input_timeout, dict);