X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=mp3_afh.c;h=d7493ac01e28bba581b7112a41a37e84426be11a;hb=00f69cb56e12b9c0106d45bbbf11b98fbcc4239f;hp=e5027a0b051a346c560b61d1141bc4da952aa7af;hpb=25ca76ec354120efa561879f50c486340e14d0ca;p=paraslash.git

diff --git a/mp3_afh.c b/mp3_afh.c
index e5027a0b..d7493ac0 100644
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@ -63,8 +63,6 @@ static const int mp3info_bitrate[2][3][14] = {
 };
 
 static const int frame_size_index[] = {24000, 72000, 72000};
-static const char *mode_text[] = {"stereo", "joint stereo", "dual channel", "mono", "invalid"};
-
 #ifdef HAVE_ID3TAG
 
 #include <id3tag.h>
@@ -350,7 +348,7 @@ static int mp3_rewrite_tags(const char *map, size_t mapsize,
 	if (ret < 0)
 		goto out;
 	new_v2size = id3_tag_render(v2_tag, NULL);
-	v2_buffer = para_malloc(new_v2size);
+	v2_buffer = alloc(new_v2size);
 	id3_tag_render(v2_tag, v2_buffer);
 	PARA_INFO_LOG("writing v2 tag (%lu bytes)\n", new_v2size);
 	ret = write_all(fd, (char *)v2_buffer, new_v2size);
@@ -433,10 +431,13 @@ static int header_frequency(struct mp3header *h)
 	return frequencies[h->version][h->freq];
 }
 
-static const char *header_mode(struct mp3header *h)
+static const char *header_mode(const struct mp3header *h)
 {
-	if (h->mode > 4)
-		h->mode = 4; /* invalid */
+	const char * const mode_text[] = {"stereo", "joint stereo",
+		"dual channel", "mono"};
+
+	if (h->mode >= ARRAY_SIZE(mode_text))
+		return "invalid";
 	return mode_text[h->mode];
 }
 
@@ -597,7 +598,7 @@ static int mp3_read_info(unsigned char *map, size_t numbytes, int fd,
 	const char *tag_versions[] = {"no", "id3v1", "id3v2", "id3v1+id3v2"};
 
 	afhi->chunks_total = 0;
-	afhi->chunk_table = para_malloc(chunk_table_size * sizeof(uint32_t));
+	afhi->chunk_table = arr_alloc(chunk_table_size, sizeof(uint32_t));
 	while (1) {
 		int freq, br;
 		struct timeval tmp, cct; /* current chunk time */
@@ -632,8 +633,8 @@ static int mp3_read_info(unsigned char *map, size_t numbytes, int fd,
 		total_time = tmp;
 		if (afhi->chunks_total >= chunk_table_size) {
 			chunk_table_size *= 2;
-			afhi->chunk_table = para_realloc(afhi->chunk_table,
-				chunk_table_size * sizeof(uint32_t));
+			afhi->chunk_table = arr_realloc(afhi->chunk_table,
+				chunk_table_size, sizeof(uint32_t));
 		}
 		afhi->chunk_table[afhi->chunks_total] = fpos;
 		afhi->chunks_total++;
@@ -651,7 +652,7 @@ static int mp3_read_info(unsigned char *map, size_t numbytes, int fd,
 	afhi->channels = header_channels(&header);
 	afhi->seconds_total = (tv2ms(&total_time) + 500) / 1000;
 	tv_divide(afhi->chunks_total, &total_time, &afhi->chunk_tv);
-	PARA_DEBUG_LOG("%" PRIu32 "chunks, each %lums\n", afhi->chunks_total,
+	PARA_DEBUG_LOG("%" PRIu32 " chunks, each %lums\n", afhi->chunks_total,
 		tv2ms(&afhi->chunk_tv));
 	set_max_chunk_size(afhi);
 	ret = mp3_get_id3(map, numbytes, fd, &afhi->tags);
@@ -674,7 +675,7 @@ static int mp3_get_file_info(char *map, size_t numbytes, int fd,
 	ret = mp3_read_info((unsigned char *)map, numbytes, fd, afhi);
 	if (ret < 0)
 		return ret;
-	if (afhi->seconds_total < 2 || !afhi->chunks_total)
+	if (afhi->chunks_total == 0)
 		return -E_MP3_INFO;
 	return 1;
 }