X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3_afh.c;h=932a772101e234165ca96aff85a9f684b07597cc;hp=ca6441606c6efaeffa1531975387f90070dfb4ad;hb=c09999a00aa049418b7ea41428ee5aedfcd1e889;hpb=8fcac57c23111fb59ca793eea4bc21e6aedcfd05 diff --git a/mp3_afh.c b/mp3_afh.c index ca644160..932a7721 100644 --- a/mp3_afh.c +++ b/mp3_afh.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2008 Andre Noll + * Copyright (C) 2003-2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -82,7 +82,7 @@ static char *get_latin1(id3_ucs4_t const *string) return (char *)id3_ucs4_latin1duplicate(string); } -char *get_stringlist(union id3_field *field) +static char *get_stringlist(union id3_field *field) { unsigned int k, nstrings = id3_field_getnstrings(field); char *result = NULL; @@ -280,7 +280,7 @@ static int frame_length(struct mp3header *header) static int compare_headers(struct mp3header *h1,struct mp3header *h2) { - if ((*(uint*)h1) == (*(uint*)h2)) + if ((*(unsigned int*)h1) == (*(unsigned int*)h2)) return 1; if ((h1->version == h2->version) && (h1->layer == h2->layer) && @@ -403,7 +403,7 @@ static int mp3_read_info(unsigned char *map, size_t numbytes, int fd, char *taginfo; afhi->chunks_total = 0; - afhi->chunk_table = para_malloc(chunk_table_size * sizeof(size_t)); + afhi->chunk_table = para_malloc(chunk_table_size * sizeof(uint32_t)); taginfo = mp3_get_id3(map, numbytes, fd); while (1) { unsigned long freq, br, fl; @@ -433,7 +433,7 @@ static int mp3_read_info(unsigned char *map, size_t numbytes, int fd, if (afhi->chunks_total >= chunk_table_size) { chunk_table_size *= 2; afhi->chunk_table = para_realloc(afhi->chunk_table, - chunk_table_size * sizeof(size_t)); + chunk_table_size * sizeof(uint32_t)); } afhi->chunk_table[afhi->chunks_total] = fpos; // if (afhi->chunks_total < 10 || !(afhi->chunks_total % 1000))