Merge ../paraslash.fml/paraslash
authorAndre Noll <maan@systemlinux.org>
Tue, 30 Jan 2007 18:31:33 +0000 (19:31 +0100)
committerAndre Noll <maan@systemlinux.org>
Tue, 30 Jan 2007 18:31:33 +0000 (19:31 +0100)
alsa_write.c
user_list.c

index 793d16b..7c090c8 100644 (file)
@@ -216,7 +216,7 @@ __malloc static void *alsa_parse_config(const char *options)
 {
        struct alsa_write_args_info *conf
                = para_calloc(sizeof(struct alsa_write_args_info));
-       PARA_INFO_LOG("options: %s, %d\n", options, strcspn(options, " \t"));
+       PARA_INFO_LOG("options: %s, %zd\n", options, strcspn(options, " \t"));
        int ret = alsa_cmdline_parser_string(options, conf, "alsa_write");
        if (ret)
                goto err_out;
index 75dca08..c3b10b1 100644 (file)
@@ -79,7 +79,7 @@ static void populate_user_list(char *user_list_file)
                        else if (!strcmp(tmp[num], "DB_WRITE"))
                                u->perms |= DB_WRITE;
                        else /* unknown permission */
-                               PARA_WARNING_LOG("unknown permission: %s\n",
+                               PARA_WARNING_LOG("ignoring unknown permission: %s\n",
                                        tmp[num]);
                }
                para_list_add(&u->node, &user_list);