X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fzone.c;h=ba07c9efcb84aab86dfd416ec66d8ba9249d8d02;hb=d2ef97c0604aac14dba6e43d5478c0372bc3ced9;hp=15eae6a222fa942116841c36c0dd20f6676417e1;hpb=00f9279d9711c9882b65d54fd72c2f25a3f403fc;p=collectd.git

diff --git a/src/zone.c b/src/zone.c
index 15eae6a2..ba07c9ef 100644
--- a/src/zone.c
+++ b/src/zone.c
@@ -49,14 +49,6 @@ 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)
 {
@@ -115,12 +107,13 @@ zone_find_stats(c_avl_tree_t *tree, zoneid_t zoneid)
 	zoneid_t     *key = NULL;
 
 	if (c_avl_get(tree, (void **)&zoneid, (void **)&ret)) {
-		if (!(ret = malloc(sizeof(zone_stats_t)))) {
+		if (!(ret = malloc(sizeof(*ret)))) {
 			WARNING("zone plugin: no memory");
 			return(NULL);
 		}
-		if (!(key = malloc(sizeof(zoneid_t)))) {
+		if (!(key = malloc(sizeof(*key)))) {
 			WARNING("zone plugin: no memory");
+			free(ret);
 			return(NULL);
 		}
 		*key = zoneid;
@@ -209,6 +202,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 */