projects
/
project
/
libubox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
blobmsg_json: avoid redefinition of json_object
[project/libubox.git]
/
ustream.h
diff --git
a/ustream.h
b/ustream.h
index
a1502af
..
6431744
100644
(file)
--- a/
ustream.h
+++ b/
ustream.h
@@
-163,9
+163,17
@@
static inline bool ustream_read_blocked(struct ustream *s)
return !!(s->read_blocked & READ_BLOCKED_USER);
}
return !!(s->read_blocked & READ_BLOCKED_USER);
}
+static inline int ustream_pending_data(struct ustream *s, bool write)
+{
+ struct ustream_buf_list *b = write ? &s->w : &s->r;
+ return b->data_bytes;
+}
+
static inline bool ustream_read_buf_full(struct ustream *s)
{
static inline bool ustream_read_buf_full(struct ustream *s)
{
- return s->r.data_bytes == s->r.buffer_len;
+ struct ustream_buf *buf = s->r.data_tail;
+ return buf && buf->data == buf->head && buf->tail == buf->end &&
+ s->r.buffers == s->r.max_buffers;
}
/*** --- functions only used by ustream implementations --- ***/
}
/*** --- functions only used by ustream implementations --- ***/