From 0866fc9d50cef68b00f0f60003793763473dcfe3 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <moritz@bunkus.org>
Date: Tue, 21 Dec 2004 16:04:38 +0000
Subject: [PATCH] Cleanup patch by Steve Lhomme (see AUTHORS).

---
 src/common/wavpack_common.cpp | 8 +++-----
 src/output/p_wavpack.cpp      | 1 -
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/common/wavpack_common.cpp b/src/common/wavpack_common.cpp
index ffe2a6b1e..a36840118 100644
--- a/src/common/wavpack_common.cpp
+++ b/src/common/wavpack_common.cpp
@@ -95,7 +95,7 @@ int32_t
 wv_parse_frame(mm_io_c *mm_io,
                wavpack_header_t &wphdr,
                wavpack_meta_t &meta) {
-  uint32_t bcount, total_bytes;
+  uint32_t bcount;
 
   // read next WavPack header
   bcount = read_next_header(mm_io, &wphdr);
@@ -122,22 +122,20 @@ wv_parse_frame(mm_io_c *mm_io,
 
     if (wphdr.flags & WV_INITIAL_BLOCK)  {
       meta.channel_count = (wphdr.flags & WV_MONO_FLAG) ? 1 : 2;
-      total_bytes = wphdr.ck_size + 8;
       if (wphdr.flags & WV_FINAL_BLOCK) {
         mxverb(3, "wavpack_reader: %s block: %s, %d bytes\n",
                (wphdr.flags & WV_MONO_FLAG) ? "mono" : "stereo",
                (wphdr.flags & WV_HYBRID_FLAG) ? "hybrid" : "lossless",
                wphdr.ck_size + 8);
       }
-    } else  {
+    } else {
       meta.channel_count += (wphdr.flags & WV_MONO_FLAG) ? 1 : 2;
-      total_bytes = wphdr.ck_size + 8;
 
       if (wphdr.flags & WV_FINAL_BLOCK) {
         mxverb(2, "wavpack_reader: %d chans: %s, %d bytes\n",
                meta.channel_count, 
                (wphdr.flags & WV_HYBRID_FLAG) ? "hybrid" : "lossless",
-               total_bytes);
+               wphdr.ck_size + 8);
       }
     }
   } else
diff --git a/src/output/p_wavpack.cpp b/src/output/p_wavpack.cpp
index 5828c7c80..6b20b6550 100644
--- a/src/output/p_wavpack.cpp
+++ b/src/output/p_wavpack.cpp
@@ -87,7 +87,6 @@ wavpack_packetizer_c::process(memories_c &mems,
                               int64_t) {
   debug_enter("wavpack_packetizer_c::process");
   memory_c & mem = *mems[0];
-  //  memory_c & mem_correc = *mems[1];
   int64_t samples = get_uint32_le(&mem.data[12]);
   int64_t sample_index = get_uint32_le(&mem.data[8]);