Merge branch 'maint'

[paraslash.git] / aac_afh.c

diff --git a/aac_afh.c b/aac_afh.c
index 7f2a22a223ce733aa4b49d0a60ff63d1b95bf321..026df50f00c43bff16294d3ec26a869517f7e3c1 100644 (file)
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -37,12 +37,8 @@ static uint32_t aac_afh_read_cb(void *user_data, void *dest, uint32_t want)
        struct aac_afh_context *c = user_data;
        uint32_t have, rv;
 
-       if (want == 0 || c->fpos >= c->mapsize) {
-               PARA_INFO_LOG("failed attempt to read %u bytes @%zu\n", want,
-                       c->fpos);
-               errno = EAGAIN;
-               return -1;
-       }
+       if (want == 0 || c->fpos >= c->mapsize)
+               return 0;
        have = c->mapsize - c->fpos;
        rv = PARA_MIN(have, want);
        PARA_DEBUG_LOG("reading %u bytes @%zu\n", rv, c->fpos);
@@ -292,8 +288,7 @@ static int aac_afh_rewrite_tags(const char *map, size_t mapsize,
                mp4ff_tag_t *tag = metadata.tags + i;
 
                ret = -E_MP4FF_META_READ;
-               if (mp4ff_meta_get_by_index(mp4ff, i,
-                               &tag->item, &tag->value) < 0)
+               if (!mp4ff_meta_get_by_index(mp4ff, i, &tag->item, &tag->value))
                        goto free_tags;
                PARA_INFO_LOG("found: %s: %s\n", tag->item, tag->value);
                if (!strcmp(tag->item, "artist"))
@@ -318,7 +313,7 @@ static int aac_afh_rewrite_tags(const char *map, size_t mapsize,
        if (!found_comment)
                add_tag(&metadata, "comment", tags->comment);
        ret = -E_MP4FF_META_WRITE;
-       if (mp4ff_meta_update(&cb, &metadata) < 0)
+       if (!mp4ff_meta_update(&cb, &metadata))
                goto free_tags;
        ret = 1;
 free_tags: