X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fzone.c;h=3751bfde9e95ee4522587261f74b8954e708128c;hb=6159b6f81403b90eb2b1f1c60fa8006cd3405d1b;hp=0e9fee386f8c47749da5d320f407dfce4a56a545;hpb=b5a33aab585aabef83c79bf3261092ca901edf9c;p=collectd.git

diff --git a/src/zone.c b/src/zone.c
index 0e9fee38..3751bfde 100644
--- a/src/zone.c
+++ b/src/zone.c
@@ -31,11 +31,10 @@
 #endif
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
-#include <sys/types.h>
-#include <sys/vm_usage.h>
 #include <procfs.h>
 #include <zone.h>
 
@@ -49,20 +48,12 @@ typedef struct zone_stats {
 	ushort_t      pctmem;
 } zone_stats_t;
 
-static long pagesize;
-
-static int zone_init (void)
-{
-	pagesize = sysconf(_SC_PAGESIZE);
-	return (0);
-}
-
 static int
-zone_compare(const zoneid_t *a, const zoneid_t *b)
+zone_compare(const void *a, const void *b)
 {
-	if (*a == *b)
+	if (*(const zoneid_t *)a == *(const zoneid_t *)b)
 		return(0);
-	if (*a < *b)
+	if (*(const zoneid_t *)a < *(const zoneid_t *)b)
 		return(-1);
 	return(1);
 }
@@ -162,7 +153,7 @@ zone_scandir(DIR *procdir)
 	c_avl_tree_t *tree;
 	zone_stats_t *stats;
 
-	if (!(tree=c_avl_create((void *) zone_compare))) {
+	if (!(tree=c_avl_create(zone_compare))) {
 		WARNING("zone plugin: Failed to create tree");
 		return(NULL);
 	}
@@ -210,6 +201,5 @@ static int zone_read (void)
 
 void module_register (void)
 {
-	plugin_register_init ("zone", zone_init);
 	plugin_register_read ("zone", zone_read);
 } /* void module_register */