Merge ../paraslash.fml/paraslash

diff --git a/alsa_write.c b/alsa_write.c
index 793d16b65a6e2006a4eb1f0b8018d9eb35ca53a8..7c090c899915cf454abad3c459dc45f0973239f8 100644 (file)
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -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;

diff --git a/user_list.c b/user_list.c
index 75dca081c7685a112e29fbc79f98d5ae0a475c34..c3b10b1e1d8ca8a915b92a7b4f3080500233210a 100644 (file)
--- a/user_list.c
+++ b/user_list.c
@@ -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);