Fix misc compile warnings in alsactl

  alsactl.c:166: warning: assignment from incompatible pointer type
  init_utils_string.c:21: warning: ‘string_is_true’ defined but not used

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/alsactl/alsactl.c b/alsactl/alsactl.c
index e0bc276195c7ad56f3e219e28cc89b6d4c1f64d9..df5aba24369f408b51c552a86b8dd89ba2fdd2c4 100644 (file)
--- a/alsactl/alsactl.c
+++ b/alsactl/alsactl.c
@@ -97,7 +97,8 @@ int main(int argc, char *argv[])
        };
        char *cfgfile = SYS_ASOUNDRC;
        char *initfile = DATADIR "/init/00main";
-       char *cardname, **tmp, ncardname[16];
+       char *cardname, ncardname[16];
+       const char *const *tmp;
        int removestate = 0;
        int init_fallback = 1; /* new default behavior */
        int res;

diff --git a/alsactl/init_utils_string.c b/alsactl/init_utils_string.c
index 2598e9f81b2448df2becf3a168a37f8721a2705b..01ea8005eb220a29ca550dd1af9b6ee210dffbae 100644 (file)
--- a/alsactl/init_utils_string.c
+++ b/alsactl/init_utils_string.c
@@ -17,17 +17,6 @@
  */
 
 
-static int string_is_true(const char *str)
-{
-       if (strcasecmp(str, "true") == 0)
-               return 1;
-       if (strcasecmp(str, "yes") == 0)
-               return 1;
-       if (strcasecmp(str, "1") == 0)
-               return 1;
-       return 0;
-}
-
 static void remove_trailing_chars(char *path, char c)
 {
        size_t len;