X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Femail.c;h=9b82e10eee8fb6dc808bd5861bac5e08410bb2bc;hb=089d33f1f455da115ca0c87160df8dbd49286377;hp=87daed113273227cfd3f82601fea5421159e6b67;hpb=af46a5f31a0e8d4279d63d8ca9232dbd433dfb25;p=collectd.git

diff --git a/src/email.c b/src/email.c
index 87daed11..9b82e10e 100644
--- a/src/email.c
+++ b/src/email.c
@@ -292,7 +292,7 @@ static void *collect (void *arg)
 
 			len = strlen (line);
 			if (('\n' != line[len - 1]) && ('\r' != line[len - 1])) {
-				log_warn ("[thread #%5lu] line too long (> %i characters): "
+				log_warn ("[thread #%5lu] line too long (> %lu characters): "
 						"'%s' (truncated)", self, sizeof (line) - 1, line);
 
 				while (NULL != fgets (line, sizeof (line), this->socket))
@@ -394,8 +394,7 @@ static void *open_connection (void *arg)
 
 	addr.sun_family = AF_UNIX;
 
-	strncpy (addr.sun_path, path, (size_t)(UNIX_PATH_MAX - 1));
-	addr.sun_path[UNIX_PATH_MAX - 1] = '\0';
+	sstrncpy (addr.sun_path, path, (size_t)(UNIX_PATH_MAX - 1));
 	unlink (addr.sun_path);
 
 	errno = 0;
@@ -659,9 +658,10 @@ static void email_submit (const char *type, const char *type_instance, gauge_t v
 	vl.time = time (NULL);
 	strcpy (vl.host, hostname_g);
 	strcpy (vl.plugin, "email");
-	strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
+	sstrncpy (vl.type, type, sizeof (vl.type));
+	sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
 
-	plugin_dispatch_values (type, &vl);
+	plugin_dispatch_values (&vl);
 } /* void email_submit */
 
 /* Copy list l1 to list l2. l2 may partly exist already, but it is assumed