aft: Rename label "err" of open_and_update_audio_file().
authorAndre Noll <maan@tuebingen.mpg.de>
Sun, 21 Dec 2014 14:54:18 +0000 (14:54 +0000)
committerAndre Noll <maan@tuebingen.mpg.de>
Sat, 4 Apr 2015 17:53:37 +0000 (17:53 +0000)
We also execute this on success.

aft.c

diff --git a/aft.c b/aft.c
index a73537c..8d32516 100644 (file)
--- a/aft.c
+++ b/aft.c
@@ -1125,13 +1125,13 @@ int open_and_update_audio_file(struct osl_row *aft_row, long score,
                return ret;
        ret = mmap_full_file(path, O_RDONLY, &map.data, &map.size, &afd->fd);
        if (ret < 0)
                return ret;
        ret = mmap_full_file(path, O_RDONLY, &map.data, &map.size, &afd->fd);
        if (ret < 0)
-               goto err;
+               goto out;
        hash_function(map.data, map.size, file_hash);
        ret = hash_compare(file_hash, aft_hash);
        para_munmap(map.data, map.size);
        if (ret) {
                ret = -E_HASH_MISMATCH;
        hash_function(map.data, map.size, file_hash);
        ret = hash_compare(file_hash, aft_hash);
        para_munmap(map.data, map.size);
        if (ret) {
                ret = -E_HASH_MISMATCH;
-               goto err;
+               goto out;
        }
        new_afsi = old_afsi;
        new_afsi.num_played++;
        }
        new_afsi = old_afsi;
        new_afsi.num_played++;
@@ -1142,12 +1142,12 @@ int open_and_update_audio_file(struct osl_row *aft_row, long score,
        load_chunk_table(&afd->afhi, chunk_table_obj.data);
        ret = make_status_items(afd, &old_afsi, path, score, file_hash);
        if (ret < 0)
        load_chunk_table(&afd->afhi, chunk_table_obj.data);
        ret = make_status_items(afd, &old_afsi, path, score, file_hash);
        if (ret < 0)
-               goto err;
+               goto out;
        aced.aft_row = aft_row;
        aced.old_afsi = &old_afsi;
        afs_event(AFSI_CHANGE, NULL, &aced);
        ret = save_afd(afd);
        aced.aft_row = aft_row;
        aced.old_afsi = &old_afsi;
        afs_event(AFSI_CHANGE, NULL, &aced);
        ret = save_afd(afd);
-err:
+out:
        free(afd->afhi.chunk_table);
        osl_close_disk_object(&chunk_table_obj);
        if (ret < 0)
        free(afd->afhi.chunk_table);
        osl_close_disk_object(&chunk_table_obj);
        if (ret < 0)