Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.openwrt.org/project/libubox.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYousong Zhou <yszhou4tech@gmail.com>2015-06-04 16:41:40 +0300
committerFelix Fietkau <nbd@openwrt.org>2015-06-14 16:15:43 +0300
commit9386d0717a7477bf094cc9b1a034ae7aae3a2f67 (patch)
treef28e6c710ce5af10428379f8f39696dd4f14dc91 /ustream.c
parent791a361ad1b08fa56e554654109122b828657a2b (diff)
ustream: tweak ustream_prepare_buf() a bit.
No functional change. - Reuse existing NULL check on buf. - Add some comments for ease of reading the code. Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
Diffstat (limited to 'ustream.c')
-rw-r--r--ustream.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/ustream.c b/ustream.c
index fc93bc2..e7ee9f0 100644
--- a/ustream.c
+++ b/ustream.c
@@ -145,21 +145,26 @@ static bool ustream_should_move(struct ustream_buf_list *l, struct ustream_buf *
int maxlen;
int offset;
+ /* nothing to squeeze */
if (buf->data == buf->head)
return false;
maxlen = buf->end - buf->head;
offset = buf->data - buf->head;
+ /* less than half is available */
if (offset > maxlen / 2)
return true;
+ /* less than 32 bytes data but takes more than 1/4 space */
if (buf->tail - buf->data < 32 && offset > maxlen / 4)
return true;
+ /* more buf is already in list or can be allocated */
if (buf != l->tail || ustream_can_alloc(l))
return false;
+ /* no need to move if len is available at the tail */
return (buf->end - buf->tail < len);
}
@@ -255,13 +260,14 @@ static bool ustream_prepare_buf(struct ustream *s, struct ustream_buf_list *l, i
if (l == &s->r)
ustream_fixup_string(s, buf);
}
+ /* some chunks available at the tail */
if (buf->tail != buf->end)
return true;
- }
-
- if (buf && buf->next) {
- l->data_tail = buf->next;
- return true;
+ /* next buf available */
+ if (buf->next) {
+ l->data_tail = buf->next;
+ return true;
+ }
}
if (!ustream_can_alloc(l))