From: Andre Noll <maan@systemlinux.org>
Date: Tue, 30 Jan 2007 18:31:33 +0000 (+0100)
Subject: Merge ../paraslash.fml/paraslash
X-Git-Tag: v0.2.15~52
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=e56519a6ef7f28ce4974fc83400418e8dcb47f33;hp=37dd76b70c9ca6459c483653c1a1d1cc9f32237c;p=paraslash.git

Merge ../paraslash.fml/paraslash
---

diff --git a/alsa_write.c b/alsa_write.c
index 793d16b6..7c090c89 100644
--- 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 75dca081..c3b10b1e 100644
--- 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);