treewide: remove unused includes

[collectd.git] / src / zone.c

diff --git a/src/zone.c b/src/zone.c
index 15eae6a..40c4d2e 100644 (file)
--- a/src/zone.c
+++ b/src/zone.c
@@ -34,8 +34,6 @@
 #include "common.h"
 #include "plugin.h"
 
-#include <sys/types.h>
-#include <sys/vm_usage.h>
 #include <procfs.h>
 #include <zone.h>
 
@@ -49,14 +47,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 +105,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 +200,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 */