mp4: Drop return value from membuffer_write() and friends.

[paraslash.git] / mp4.c

diff --git a/mp4.c b/mp4.c
index 7f223bc3ea67853bd2b6e42ee49eeb5f9c3949fe..c0efc4fa77d53013e8445fb9b261ea3e9677ac9b 100644 (file)
--- a/mp4.c
+++ b/mp4.c
@@ -1143,28 +1143,22 @@ struct membuffer {
        void *data;
        unsigned written;
        unsigned allocated;
-       unsigned error;
 };
 
 static struct membuffer *membuffer_create(void)
 {
-       const unsigned initial_size = 256;
-
-       struct membuffer *buf = para_malloc(sizeof(*buf));
-       buf->data = para_malloc(initial_size);
-       buf->written = 0;
-       buf->allocated = initial_size;
-       buf->error = buf->data == 0 ? 1 : 0;
+       struct membuffer *buf = para_calloc(sizeof(*buf));
 
+       buf->allocated = 256;
+       buf->data = para_malloc(buf->allocated);
        return buf;
 }
 
-static unsigned membuffer_write(struct membuffer *buf, const void *ptr, unsigned bytes)
+static void membuffer_write(struct membuffer *buf, const void *ptr,
+               unsigned bytes)
 {
        unsigned dest_size = buf->written + bytes;
 
-       if (buf->error)
-               return 0;
        if (dest_size > buf->allocated) {
                do {
                        buf->allocated <<= 1;
@@ -1175,19 +1169,18 @@ static unsigned membuffer_write(struct membuffer *buf, const void *ptr, unsigned
        if (ptr)
                memcpy((char *) buf->data + buf->written, ptr, bytes);
        buf->written += bytes;
-       return bytes;
 }
 
-static unsigned membuffer_write_atom_name(struct membuffer *buf, const char *data)
+static void membuffer_write_atom_name(struct membuffer *buf, const char *data)
 {
-       return membuffer_write(buf, data, 4) == 4 ? 1 : 0;
+       membuffer_write(buf, data, 4);
 }
 
-static unsigned membuffer_write_int32(struct membuffer *buf, uint32_t data)
+static void membuffer_write_int32(struct membuffer *buf, uint32_t data)
 {
        uint8_t temp[4];
        write_u32_be(temp, data);
-       return membuffer_write(buf, temp, 4);
+       membuffer_write(buf, temp, 4);
 }
 
 static void membuffer_write_std_tag(struct membuffer *buf, const char *name,
@@ -1208,11 +1201,6 @@ static void membuffer_write_std_tag(struct membuffer *buf, const char *name,
        membuffer_write(buf, value, len);
 }
 
-static unsigned membuffer_error(const struct membuffer *buf)
-{
-       return buf->error;
-}
-
 static void membuffer_free(struct membuffer *buf)
 {
        free(buf->data);
@@ -1226,13 +1214,8 @@ static unsigned membuffer_get_size(const struct membuffer *buf)
 
 static void *membuffer_detach(struct membuffer *buf)
 {
-       void *ret;
-
-       if (buf->error)
-               return 0;
-       ret = para_realloc(buf->data, buf->written);
-       buf->data = 0;
-       buf->error = 1;
+       void *ret = para_realloc(buf->data, buf->written);
+       free(buf);
        return ret;
 }
 
@@ -1271,15 +1254,8 @@ static uint32_t create_ilst(const struct mp4_metadata *meta, void **out_buffer,
                else
                        PARA_ERROR_LOG("invalid tag item: %s\n", tag->item);
        }
-       if (membuffer_error(buf)) {
-               membuffer_free(buf);
-               return 0;
-       }
-
        *out_size = membuffer_get_size(buf);
        *out_buffer = membuffer_detach(buf);
-       membuffer_free(buf);
-
        return 1;
 }
 
@@ -1296,32 +1272,24 @@ static void *membuffer_get_ptr(const struct membuffer *buf)
        return buf->data;
 }
 
-static void membuffer_set_error(struct membuffer *buf)
-{
-       buf->error = 1;
-}
-
-static unsigned membuffer_transfer_from_file(struct membuffer *buf, struct mp4 *src,
+static bool membuffer_transfer_from_file(struct membuffer *buf, struct mp4 *src,
                unsigned bytes)
 {
        unsigned oldsize;
        void *bufptr;
 
        oldsize = membuffer_get_size(buf);
-       if (membuffer_write(buf, 0, bytes) != bytes)
-               return 0;
-
+       membuffer_write(buf, 0, bytes);
        bufptr = membuffer_get_ptr(buf);
        if (bufptr == 0)
-               return 0;
+               return false;
 
        if ((unsigned)read_data(src, (char *) bufptr + oldsize, bytes) !=
                bytes) {
-               membuffer_set_error(buf);
-               return 0;
+               membuffer_free(buf);
+               return false;
        }
-
-       return bytes;
+       return true;
 }
 
 static uint32_t create_meta(const struct mp4_metadata *meta, void **out_buffer,
@@ -1342,7 +1310,6 @@ static uint32_t create_meta(const struct mp4_metadata *meta, void **out_buffer,
 
        *out_size = membuffer_get_size(buf);
        *out_buffer = membuffer_detach(buf);
-       membuffer_free(buf);
        return 1;
 }
 
@@ -1364,7 +1331,6 @@ uint32_t * out_size)
 
        *out_size = membuffer_get_size(buf);
        *out_buffer = membuffer_detach(buf);
-       membuffer_free(buf);
        return 1;
 }
 
@@ -1396,17 +1362,17 @@ static void *modify_moov(struct mp4 *f, uint32_t *out_size)
 
                buf = membuffer_create();
                set_position(f, total_base);
-               membuffer_transfer_from_file(buf, f, total_size);
-
+               if (!membuffer_transfer_from_file(buf, f, total_size)) {
+                       free(new_udta_buffer);
+                       return NULL;
+               }
                membuffer_write_atom(buf, "udta", new_udta_size,
                        new_udta_buffer);
 
                free(new_udta_buffer);
 
                *out_size = membuffer_get_size(buf);
-               out_buffer = membuffer_detach(buf);
-               membuffer_free(buf);
-               return out_buffer;
+               return membuffer_detach(buf);
        }
        udta_offset = get_position(f);
        udta_size = read_int32(f);
@@ -1420,21 +1386,25 @@ static void *modify_moov(struct mp4 *f, uint32_t *out_size)
 
                buf = membuffer_create();
                set_position(f, total_base);
-               membuffer_transfer_from_file(buf, f,
-                       (uint32_t)(udta_offset - total_base));
+               if (!membuffer_transfer_from_file(buf, f,
+                               udta_offset - total_base)) {
+                       free(new_meta_buffer);
+                       return NULL;
+               }
 
                membuffer_write_int32(buf, udta_size + 8 + new_meta_size);
                membuffer_write_atom_name(buf, "udta");
-               membuffer_transfer_from_file(buf, f, udta_size);
+               if (!membuffer_transfer_from_file(buf, f, udta_size)) {
+                       free(new_meta_buffer);
+                       return NULL;
+               }
 
                membuffer_write_atom(buf, "meta", new_meta_size,
                        new_meta_buffer);
                free(new_meta_buffer);
 
                *out_size = membuffer_get_size(buf);
-               out_buffer = membuffer_detach(buf);
-               membuffer_free(buf);
-               return out_buffer;
+               return membuffer_detach(buf);
        }
        meta_offset = get_position(f);
        meta_size = read_int32(f);