Merge branch 't/timing_improvements'

[paraslash.git] / wma_common.c

diff --git a/wma_common.c b/wma_common.c
index dab96257d09876916240817811508c31c45b29d6..1dde83509f2e38e8ba044fc961c381e06b74b7ca 100644 (file)
--- a/wma_common.c
+++ b/wma_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -38,8 +38,8 @@ const char *search_pattern(const char *pattern, int pattern_len,
        for (p = buf; p + pattern_len < end; p++) {
                if (memcmp(p, pattern, pattern_len))
                        continue;
-               PARA_DEBUG_LOG("found %d byte pattern@%zd\n",
-                       pattern_len, p - buf);
+               PARA_DEBUG_LOG("found %d byte pattern@%d\n",
+                       pattern_len, (int)(p - buf));
                return p;
        }
        PARA_NOTICE_LOG("%d byte pattern not found\n", pattern_len);
@@ -56,7 +56,7 @@ static int find_audio_stream_info(const char *buf, int len)
 
        if (!p)
                return -E_WMA_NO_GUID;
-       PARA_DEBUG_LOG("found audio stream guid@%0zx\n", p - buf);
+       PARA_DEBUG_LOG("found audio stream guid@%0x\n", (int)(p - buf));
        return p - buf + 16;
 }
 
@@ -116,7 +116,7 @@ int read_asf_header(const char *buf, int loaded, struct asf_header_info *ahi)
        return 1;
 }
 
-const uint8_t log2_tab[256] = {
+static const uint8_t log2_tab[256] = {
        0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4,
        4, 4, 4, 4, 4, 4, 4, 4,
        5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
@@ -142,7 +142,7 @@ const uint8_t log2_tab[256] = {
  *
  * \return An integer approximation of log2(v).
  */
-int wma_log2(unsigned int v)
+__a_const int wma_log2(unsigned int v)
 {
        int n = 0;
        if (v & 0xffff0000) {