From 08837a80e0c4a2d88d27038a0915c98375a2bf88 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 18 Feb 2009 15:34:57 +0100 Subject: [PATCH] Fix misc compile warnings in alsactl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- alsactl/alsactl.c | 3 ++- alsactl/init_utils_string.c | 11 ----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/alsactl/alsactl.c b/alsactl/alsactl.c index e0bc276..df5aba2 100644 --- 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 2598e9f..01ea800 100644 --- 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;