X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectd.c;h=71eb940fb3251b6ffee1af4829fdc92c915460ce;hb=fd9c88963b04c9e9050a952ba0f018493e8b7638;hp=a3f63b48007336bc48621fa366cbf90a96ccff4c;hpb=62430c784cf53c7dccb6fec021f9bb4c0d790a0f;p=collectd.git

diff --git a/src/collectd.c b/src/collectd.c
index a3f63b48..71eb940f 100644
--- a/src/collectd.c
+++ b/src/collectd.c
@@ -50,7 +50,7 @@ static int loop = 0;
 static void *do_flush (void *arg)
 {
 	INFO ("Flushing all data.");
-	plugin_flush_all (-1);
+	plugin_flush (NULL, -1, NULL);
 	INFO ("Finished flushing all data.");
 	pthread_exit (NULL);
 	return NULL;
@@ -90,8 +90,7 @@ static int init_hostname (void)
 	str = global_option_get ("Hostname");
 	if (str != NULL)
 	{
-		strncpy (hostname_g, str, sizeof (hostname_g));
-		hostname_g[sizeof (hostname_g) - 1] = '\0';
+		sstrncpy (hostname_g, str, sizeof (hostname_g));
 		return (0);
 	}
 
@@ -127,8 +126,7 @@ static int init_hostname (void)
 		if (ai_ptr->ai_canonname == NULL)
 			continue;
 
-		strncpy (hostname_g, ai_ptr->ai_canonname, sizeof (hostname_g));
-		hostname_g[sizeof (hostname_g) - 1] = '\0';
+		sstrncpy (hostname_g, ai_ptr->ai_canonname, sizeof (hostname_g));
 		break;
 	}