X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=ustream.c;h=fd4339527d305dfcd9851fe0fb4562e7b6082141;hp=9c6180657e1e0cd746c32ac90150a507d451b0e2;hb=c434230a76e2fdd97b77ca96f64569c91e7df8a1;hpb=29c066cfd60cc9101201a2c31a9aa66288288719

diff --git a/ustream.c b/ustream.c
index 9c61806..fd43395 100644
--- a/ustream.c
+++ b/ustream.c
@@ -37,6 +37,7 @@ static void ustream_init_buf(struct ustream_buf *buf, int len)
 
 static void ustream_add_buf(struct ustream_buf_list *l, struct ustream_buf *buf)
 {
+	l->buffers++;
 	if (!l->tail)
 		l->head = buf;
 	else
@@ -310,15 +311,13 @@ void ustream_fill_read(struct ustream *s, int len)
 
 char *ustream_get_read_buf(struct ustream *s, int *buflen)
 {
-	char *data;
-	int len;
+	char *data = NULL;
+	int len = 0;
 
 	if (s->r.head) {
 		len = s->r.head->tail - s->r.head->data;
-		data = s->r.head->data;
-	} else {
-		len = 0;
-		data = NULL;
+		if (len > 0)
+			data = s->r.head->data;
 	}
 
 	if (buflen)
@@ -329,8 +328,9 @@ char *ustream_get_read_buf(struct ustream *s, int *buflen)
 
 static void ustream_write_error(struct ustream *s)
 {
+	if (!s->write_error)
+		ustream_state_change(s);
 	s->write_error = true;
-	ustream_state_change(s);
 }
 
 bool ustream_write_pending(struct ustream *s)