mysql.c: fix -Wshadow warnings
authorAndre Noll <maan@systemlinux.org>
Mon, 5 Mar 2007 19:40:52 +0000 (20:40 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 5 Mar 2007 19:40:52 +0000 (20:40 +0100)
mysql_selector.c

index e545f0d..0a7d81f 100644 (file)
@@ -52,7 +52,7 @@ struct para_macro {
        const char *replacement;
 };
 
-static struct para_macro macro_list[] = {
+static struct para_macro mysql_macro_list[] = {
        {       .name = "IS_N_SET",
                .replacement = "(data.%s != '1')"
        }, {
@@ -785,7 +785,7 @@ static char *get_query(char *streamname, char *filename, int with_path)
                        continue;
                arg = line + n;
                if (!strcmp(command, "accept:")) {
-                       char *tmp2 = s_a_r_list(macro_list, arg);
+                       char *tmp2 = s_a_r_list(mysql_macro_list, arg);
                        if (accept_opts)
                                accept_opts = para_strcat(
                                        accept_opts, " or ");
@@ -794,7 +794,7 @@ static char *get_query(char *streamname, char *filename, int with_path)
                        continue;
                }
                if (!strcmp(command, "deny:")) {
-                       char *tmp2 = s_a_r_list(macro_list, arg);
+                       char *tmp2 = s_a_r_list(mysql_macro_list, arg);
                        if (deny_opts)
                                deny_opts = para_strcat(deny_opts, " or ");
                        deny_opts = para_strcat(deny_opts, tmp2);
@@ -802,10 +802,10 @@ static char *get_query(char *streamname, char *filename, int with_path)
                        continue;
                }
                if (!score && !strcmp(command, "score:"))
-                       score = s_a_r_list(macro_list, arg);
+                       score = s_a_r_list(mysql_macro_list, arg);
        }
        if (!score) {
-               score = s_a_r_list(macro_list, conf.mysql_default_score_arg);
+               score = s_a_r_list(mysql_macro_list, conf.mysql_default_score_arg);
                if (!score)
                        goto out;
        }
@@ -914,7 +914,7 @@ static char *get_current_audio_file(void)
 static int com_la_info(int fd, int argc, char *argv[])
 {
        char *name = NULL, *meta = NULL, *atts = NULL, *dir = NULL;
-       int ret, com_la = strcmp(argv[0], "info");
+       int ret, la = strcmp(argv[0], "info");
 
        if (argc < 2) {
                ret = -E_GET_AUDIO_FILE;
@@ -931,7 +931,7 @@ static int com_la_info(int fd, int argc, char *argv[])
        meta = get_meta(name, 1);
        atts = get_atts(name, 0);
        dir = get_dir(name);
-       if (com_la)
+       if (la)
                ret = send_va_buffer(fd, "%s\n", atts);
        else
                ret = send_va_buffer(fd, "dir: %s\n" "%s\n" "attributes: %s\n",