X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=ustream.c;h=828a025b267bc30ba250d589842c1bd4ab6cb734;hp=719af992030e76d11529cca1c813f3ab0738e74d;hb=c725f9f7a551bf31fd315d66c2a8a7fb8892b911;hpb=8686989fffaf8041889edbe5319581bc0fa8c847

diff --git a/ustream.c b/ustream.c
index 719af99..828a025 100644
--- a/ustream.c
+++ b/ustream.c
@@ -94,9 +94,6 @@ void ustream_free(struct ustream *s)
 	uloop_timeout_cancel(&s->state_change);
 	ustream_free_buffers(&s->r);
 	ustream_free_buffers(&s->w);
-	s->write_error = false;
-	s->eof = false;
-	s->read_blocked = 0;
 }
 
 static void ustream_state_change_cb(struct uloop_timeout *t)
@@ -131,6 +128,16 @@ void ustream_init_defaults(struct ustream *s)
 #undef DEFAULT_SET
 
 	s->state_change.cb = ustream_state_change_cb;
+	s->write_error = false;
+	s->eof = false;
+	s->eof_write_done = false;
+	s->read_blocked = 0;
+
+	s->r.buffers = 0;
+	s->r.data_bytes = 0;
+
+	s->w.buffers = 0;
+	s->w.data_bytes = 0;
 }
 
 static bool ustream_should_move(struct ustream_buf_list *l, struct ustream_buf *buf, int len)
@@ -269,7 +276,7 @@ static bool ustream_prepare_buf(struct ustream *s, struct ustream_buf_list *l, i
 
 char *ustream_reserve(struct ustream *s, int len, int *maxlen)
 {
-	struct ustream_buf *buf = s->r.head;
+	struct ustream_buf *buf;
 
 	if (!ustream_prepare_buf(s, &s->r, len)) {
 		__ustream_set_read_blocked(s, s->read_blocked | READ_BLOCKED_FULL);
@@ -311,15 +318,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)
@@ -330,8 +335,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)