From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 21 Dec 2014 14:54:18 +0000 (+0000)
Subject: aft: Rename label "err" of open_and_update_audio_file().
X-Git-Tag: v0.5.5~47
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=87359d9e0756f61e8ed695ca15d21cc9098681d0

aft: Rename label "err" of open_and_update_audio_file().

We also execute this on success.
---

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)