projects
/
project
/
libubox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ustream: return NULL in ustream_get_read_buf if there's a buffer, but no data
[project/libubox.git]
/
ustream.c
diff --git
a/ustream.c
b/ustream.c
index
9c61806
..
fd43395
100644
(file)
--- 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)
{
static void ustream_add_buf(struct ustream_buf_list *l, struct ustream_buf *buf)
{
+ l->buffers++;
if (!l->tail)
l->head = buf;
else
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 *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;
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)
}
if (buflen)
@@
-329,8
+328,9
@@
char *ustream_get_read_buf(struct ustream *s, int *buflen)
static void ustream_write_error(struct ustream *s)
{
static void ustream_write_error(struct ustream *s)
{
+ if (!s->write_error)
+ ustream_state_change(s);
s->write_error = true;
s->write_error = true;
- ustream_state_change(s);
}
bool ustream_write_pending(struct ustream *s)
}
bool ustream_write_pending(struct ustream *s)