Merge commit 'fml/master'

diff --git a/mp3_afh.c b/mp3_afh.c
index 41874b86404cfc239a24891c30dcb6545b887f38..932a772101e234165ca96aff85a9f684b07597cc 100644 (file)
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@ -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))

diff --git a/para.h b/para.h
index fcc24746be9b18d5460292b42504898106131689..06eb8b30f617104051fb3260e5b17c261a04ec17 100644 (file)
--- a/para.h
+++ b/para.h
@@ -230,7 +230,8 @@ static inline long int para_random(unsigned max)
 }
 
 /** Round up x to a multiple of y */
-#define ROUND_UP(x, y) (((x) + ((y) - 1) / (y)) * (y))
+#define ROUND_UP(x, y) ((((x) + ((y) - 1)) / (y)) * (y))
+
 
 /** Get the size of an array */
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))