X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fzone.c;h=1781775ff90b68a5a4abba5af4792ea086175b40;hb=47761781efc410c30c2735cb10713b833e2a5148;hp=21a9497e4b7186e42f0748125641b0df73964fa0;hpb=005af449f773efba843edabff054deb9a20dacbb;p=collectd.git

diff --git a/src/zone.c b/src/zone.c
index 21a9497e..1781775f 100644
--- a/src/zone.c
+++ b/src/zone.c
@@ -86,7 +86,7 @@ zone_submit_value(char *zone, gauge_t value)
 	vl.values_len = 1; /*STATIC_ARRAY_SIZE (values);*/
 	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "zone", sizeof (vl.plugin));
- 	sstrncpy (vl.type, "zone_cpu", sizeof (vl.type));
+ 	sstrncpy (vl.type, "percent", sizeof (vl.type));
  	sstrncpy (vl.type_instance, zone, sizeof (vl.type_instance));
 
 	return(plugin_dispatch_values (&vl));
@@ -100,16 +100,16 @@ zone_find_stats(c_avl_tree_t *tree, zoneid_t zoneid)
 
 	if (c_avl_get(tree, (void **)&zoneid, (void **)&ret)) {
 		if (!(ret = malloc(sizeof(zone_stats_t)))) {
-			WARNING("no memory");
+			WARNING("zone plugin: no memory");
 			return(NULL);
 		}
 		if (!(key = malloc(sizeof(zoneid_t)))) {
-			WARNING("no memory");
+			WARNING("zone plugin: no memory");
 			return(NULL);
 		}
 		*key = zoneid;
 		if (c_avl_insert(tree, key, ret)) {
-			WARNING("error inserting into tree");
+			WARNING("zone plugin: error inserting into tree");
 			return(NULL);
 		}
 	}
@@ -144,9 +144,8 @@ zone_scandir(DIR *procdir)
 	zone_stats_t *stats;
 /*	size_t    physmem = sysconf(_SC_PHYS_PAGES) * pagesize;*/
 
-	if (!(tree=c_avl_create((int (*)
-				 (const void *, const void *))zone_compare))) {
-		WARNING("Failed to create tree");
+	if (!(tree=c_avl_create((void *) zone_compare))) {
+		WARNING("zone plugin: Failed to create tree");
 		return(NULL);
 	}
 
@@ -175,7 +174,7 @@ static int zone_read (void)
 
 	pagesize = sysconf(_SC_PAGESIZE);
 	if ((procdir = opendir("/proc")) == NULL) {
-		ERROR("cannot open /proc directory\n");
+		ERROR("zone plugin: cannot open /proc directory\n");
 		exit(1);
 	}