Fixed hw_params dump and a typo

diff --git a/src/pcm/mask.h b/src/pcm/mask.h
index 541c58b0a866201ac6c580dcca5b4469c9291d40..8a65461900f3522c9dd82a8a0ce52f4f51cf3f64 100644 (file)
--- a/src/pcm/mask.h
+++ b/src/pcm/mask.h
@@ -25,7 +25,7 @@
 #include <assert.h>
 #include "asoundlib.h"
 
-#define MASK_MAX 32
+#define MASK_MAX 31
 
 #ifdef MASK_INLINE
 #include "mask_inline.h"

diff --git a/src/pcm/mask_inline.h b/src/pcm/mask_inline.h
index 7915f4eea2e25f7114d944b61e7645f458d8a28f..448921106ac7e2ac1c3566e172c3395a4522b726 100644 (file)
--- a/src/pcm/mask_inline.h
+++ b/src/pcm/mask_inline.h
@@ -29,7 +29,7 @@
 #endif
 
 #ifndef MASK_MASK
-#define MASK_MAX 32
+#define MASK_MAX 31
 #endif
 
 struct _mask {

diff --git a/src/pcm/pcm_params.c b/src/pcm/pcm_params.c
index 324e62c4684c32327e1cc49e3269f3ce7cffa71e..879a4968480eb1c7398b01b8b45b2673aecf3539 100644 (file)
--- a/src/pcm/pcm_params.c
+++ b/src/pcm/pcm_params.c
@@ -806,12 +806,12 @@ void snd_pcm_hw_param_dump(const snd_pcm_hw_params_t *params,
                        fputs(" ALL", fp);
                else {
                        unsigned int k;
+                       const char *(*f)(unsigned int k);
+                       f = funcs[var];
                        for (k = 0; k <= MASK_MAX; ++k) {
                                if (mask_test(mask, k)) {
-                                       const char *(*f)(unsigned int k);
                                        putc(' ', fp);
                                        assert(var < sizeof(funcs) / sizeof(funcs[0]));
-                                       f = funcs[k];
                                        assert(f);
                                        fputs(f(k), fp);
                                }