Don't let make write the filename into the output

[paraslash.git] / ogg_afh.c

diff --git a/ogg_afh.c b/ogg_afh.c
index b6132edf7bc3740c55836df48d62d66c9ee5609e..c633f92f23615b490395253b7869fd7f219511b0 100644 (file)
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2004-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -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;
 }