X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fmemory.c;h=81ae451b9a74c518c8f9ef43e6a1b8b9240818d7;hb=12f08ff05e4f451232072c52f1383a0fb97db707;hp=a4a9af3a2128fdce1343d90e7b6e85a24eb8b7dd;hpb=59f405559485a04c30b88c2f68fa9e112bdab6a6;p=collectd.git

diff --git a/src/memory.c b/src/memory.c
index a4a9af3a..81ae451b 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/memory.c
- * Copyright (C) 2005-2007  Florian octo Forster
+ * Copyright (C) 2005-2008  Florian octo Forster
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -92,8 +92,11 @@ static int memory_init (void)
 #elif defined(HAVE_LIBKSTAT)
 	/* getpagesize(3C) tells me this does not fail.. */
 	pagesize = getpagesize ();
-	if (get_kstat (&ksp, "unix", 0, "system_pages"))
+	if (get_kstat (&ksp, "unix", 0, "system_pages") != 0)
+	{
 		ksp = NULL;
+		return (-1);
+	}
 #endif /* HAVE_LIBKSTAT */
 
 	return (0);
@@ -111,10 +114,10 @@ static void memory_submit (const char *type_instance, gauge_t value)
 	vl.time = time (NULL);
 	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "memory", sizeof (vl.plugin));
-	strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
-	vl.type_instance[sizeof (vl.type_instance) - 1] = '\0';
+	sstrncpy (vl.type, "memory", sizeof (vl.type));
+	sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
 
-	plugin_dispatch_values ("memory", &vl);
+	plugin_dispatch_values (&vl);
 }
 
 static int memory_read (void)