]> git.tuebingen.mpg.de Git - paraslash.git/commitdiff
mp4: Merge membuffer_free() into membuffer_transfer_from_file().
authorAndre Noll <maan@tuebingen.mpg.de>
Sat, 14 Aug 2021 21:20:15 +0000 (23:20 +0200)
committerAndre Noll <maan@tuebingen.mpg.de>
Mon, 30 May 2022 19:37:35 +0000 (21:37 +0200)
The latter is the only caller of the former.

mp4.c

diff --git a/mp4.c b/mp4.c
index e20cf9385bf1a9138a342945e6e1d42bf8eabe91..03f80ba9aa23a473050f6a3eb85f855149901340 100644 (file)
--- a/mp4.c
+++ b/mp4.c
@@ -1201,12 +1201,6 @@ static void membuffer_write_std_tag(struct membuffer *buf, const char *name,
        membuffer_write(buf, value, len);
 }
 
-static void membuffer_free(struct membuffer *buf)
-{
-       free(buf->data);
-       free(buf);
-}
-
 static unsigned membuffer_get_size(const struct membuffer *buf)
 {
        return buf->written;
@@ -1281,7 +1275,8 @@ static bool membuffer_transfer_from_file(struct membuffer *buf, struct mp4 *src,
        membuffer_write(buf, 0, bytes);
        bufptr = membuffer_get_ptr(buf);
        if (read_data(src, bufptr + oldsize, bytes) != bytes) {
-               membuffer_free(buf);
+               free(buf->data);
+               free(buf);
                return false;
        }
        return true;