From e06c60040db60f45f6e0bb3095e8dac21420f126 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Mon, 1 Dec 2008 21:54:35 +0100 Subject: [PATCH] Fix another gcc warning caused by PARA_MAX(). Clean up ogg_compute_chunk_table() while we're at it. --- ogg_afh.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/ogg_afh.c b/ogg_afh.c index b6132edf..2030eada 100644 --- a/ogg_afh.c +++ b/ogg_afh.c @@ -207,37 +207,30 @@ static long unsigned ogg_compute_chunk_table(OggVorbis_File *of, struct afh_info *afhi, long unsigned time_total) { int i, ret, num; - ssize_t max_chunk_len, pos = 0, min = 0, old_pos; long unsigned num_chunks; + ogg_int64_t max = 0, min = 0, old_pos = 0; - old_pos = 0; ret = 0; num = time_total / chunk_time + 3; PARA_DEBUG_LOG("chunk time: %g allocating %d chunk pointers\n", chunk_time, num); afhi->chunk_table = para_malloc((num + 1) * sizeof(size_t)); afhi->chunk_table[0] = 0; - max_chunk_len = 0; - for (i = 1; ret <= num; i++) { - ogg_int64_t diff; + for (i = 1; i <= num; i++) { + ogg_int64_t diff, pos; ret = ov_time_seek(of, i * chunk_time); if (ret) break; pos = ov_raw_tell(of); diff = pos - old_pos; - max_chunk_len = PARA_MAX(max_chunk_len, diff); + max = PARA_MAX(max, diff); min = (i == 1)? diff : PARA_MIN(min, diff); afhi->chunk_table[i] = pos; -// if (i < 11 || !((i - 1) % 1000)|| i > num - 11) -// PARA_DEBUG_LOG("chunk #%d: %g secs, pos: %zd, " -// "size: %zd\n", i - 1, -// i * chunk_time, pos, pos - old_pos); old_pos = pos; } num_chunks = i - 1; -//fi->chunk_table[i] = pos; - PARA_DEBUG_LOG("%lu chunks (%fs), max chunk: %zd, min chunk: %zd\n", - num_chunks, chunk_time, max_chunk_len, min); + PARA_DEBUG_LOG("%lu chunks (%fs), max chunk: %lld, min chunk: %lld\n", + num_chunks, chunk_time, (long long)max, (long long)min); return num_chunks; } -- 2.39.5