Merge branch 'master' of /var/lib/git/collectd

Conflicts:

	src/email.c

diff --git a/src/email.c b/src/email.c
index bcdb357..fbdc785 100644 (file)
--- a/src/email.c
+++ b/src/email.c
@@ -292,9 +292,9 @@ static void *collect (void *arg)
 
                        len = strlen (line);
                        if (('\n' != line[len - 1]) && ('\r' != line[len - 1])) {
-                               log_warn ("[thread #%5lu] line too long (> %lu characters): "
+                               log_warn ("[thread #%5lu] line too long (> %zu characters): "
                                                "'%s' (truncated)",
-                                               self, (unsigned long) (sizeof (line) - 1), line);
+                                               (unsigned long) self, sizeof (line) - 1, line);
 
                                while (NULL != fgets (line, sizeof (line), this->socket))
                                        if (('\n' == line[len - 1]) || ('\r' == line[len - 1]))