utils: use constant byte-order conversion

[project/libubox.git] / ustream.c

diff --git a/ustream.c b/ustream.c
index fc93bc2..d36ce08 100644 (file)
--- a/ustream.c
+++ b/ustream.c
@@ -65,6 +65,9 @@ static int ustream_alloc_default(struct ustream *s, struct ustream_buf_list *l)
                return -1;
 
        buf = malloc(sizeof(*buf) + l->buffer_len + s->string_data);
+       if (!buf)
+               return -1;
+
        ustream_init_buf(buf, l->buffer_len);
        ustream_add_buf(l, buf);
 
@@ -145,21 +148,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 +263,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))
@@ -484,6 +493,8 @@ int ustream_vprintf(struct ustream *s, const char *format, va_list arg)
                        return ustream_write_buffered(s, buf, maxlen, wr);
                } else {
                        buf = malloc(maxlen + 1);
+                       if (!buf)
+                               return 0;
                        wr = vsnprintf(buf, maxlen + 1, format, arg);
                        wr = ustream_write(s, buf, wr, false);
                        free(buf);
@@ -511,6 +522,8 @@ int ustream_vprintf(struct ustream *s, const char *format, va_list arg)
                return wr;
 
        buf = malloc(maxlen + 1);
+       if (!buf)
+               return wr;
        maxlen = vsnprintf(buf, maxlen + 1, format, arg);
        wr = ustream_write_buffered(s, buf + wr, maxlen - wr, wr);
        free(buf);