From: Andre Noll <maan@systemlinux.org>
Date: Sun, 22 Jun 2008 01:53:00 +0000 (+0200)
Subject: mp3_afh.c: Simplify mp3_get_id3().
X-Git-Tag: v0.3.3~54^2
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=2968f502b9e01f5e9f0f38ac918ce6ed801b04f1;p=paraslash.git

mp3_afh.c: Simplify mp3_get_id3().

No need to pass the fpos pointer here.
---

diff --git a/mp3_afh.c b/mp3_afh.c
index 4093a313..5a8c956d 100644
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@ -261,8 +261,10 @@ static int mp3_seek_next_header(unsigned char *map, size_t numbytes, off_t *fpos
 	return 0;
 }
 
-static void mp3_get_id3(unsigned char *map, size_t numbytes, off_t *fpos)
+static void mp3_get_id3(unsigned char *map, size_t numbytes)
 {
+	off_t fpos;
+
 	mp3.id3_isvalid = 0;
 	mp3.id3.title[0] = '\0';
 	mp3.id3.artist[0] = '\0';
@@ -271,25 +273,25 @@ static void mp3_get_id3(unsigned char *map, size_t numbytes, off_t *fpos)
 	mp3.id3.year[0] = '\0';
 	if (numbytes < 128)
 		return;
-	*fpos = numbytes - 128;
-	if (strncmp("TAG", (char *) map + *fpos, 3)) {
+	fpos = numbytes - 128;
+	if (strncmp("TAG", (char *) map + fpos, 3)) {
 		PARA_DEBUG_LOG("no id3 tag\n");
 		return;
 	}
-	*fpos = numbytes - 125;
-	memcpy(mp3.id3.title, map + *fpos, 30);
-	*fpos += 30;
+	fpos = numbytes - 125;
+	memcpy(mp3.id3.title, map + fpos, 30);
+	fpos += 30;
 	mp3.id3.title[30] = '\0';
-	memcpy(mp3.id3.artist, map + *fpos, 30);
-	*fpos += 30;
+	memcpy(mp3.id3.artist, map + fpos, 30);
+	fpos += 30;
 	mp3.id3.artist[30] = '\0';
-	memcpy(mp3.id3.album, map + *fpos, 30);
-	*fpos += 30;
+	memcpy(mp3.id3.album, map + fpos, 30);
+	fpos += 30;
 	mp3.id3.album[30] = '\0';
-	memcpy(mp3.id3.year, map + *fpos, 4);
-	*fpos += 4;
+	memcpy(mp3.id3.year, map + fpos, 4);
+	fpos += 4;
 	mp3.id3.year[4] = '\0';
-	memcpy(mp3.id3.comment, map + *fpos, 30);
+	memcpy(mp3.id3.comment, map + fpos, 30);
 	mp3.id3.comment[30] = '\0';
 	mp3.id3_isvalid = 1;
 	unpad(mp3.id3.title);
@@ -328,8 +330,7 @@ static int mp3_read_info(unsigned char *map, size_t numbytes,
 
 	afhi->chunks_total = 0;
 	afhi->chunk_table = para_malloc(chunk_table_size * sizeof(size_t));
-	mp3_get_id3(map, numbytes, &fpos);
-	fpos = 0;
+	mp3_get_id3(map, numbytes);
 	mp3.vbr = 0;
 	while (1) {
 		unsigned long freq, br, fl;