X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=8d32516d22f3c2526926eba5bdcb46717c5c662e;hp=a73537c74446b3cdb49e405f7918701d837a8e8f;hb=a181da64ba896c709d61e775606a0b8ebfdd1dde;hpb=fb9bb2beb2aea456d99cd93f6badc0b3164b3e29 diff --git a/aft.c b/aft.c index a73537c7..8d32516d 100644 --- 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) - 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; - goto err; + goto out; } 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) - goto err; + goto out; 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)