X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fzone.c;h=d9e46f5ad1ea690ca022b2732c09a3918046f558;hb=e2ff4dd149e85527eba7a38a8f38aeb3b548f39c;hp=40c4d2ee5a3dad252f5a40d59bd883f0a419f434;hpb=2ce1db8202b1eba6da45b347c0c81a508f8c088a;p=collectd.git diff --git a/src/zone.c b/src/zone.c index 40c4d2ee..d9e46f5a 100644 --- a/src/zone.c +++ b/src/zone.c @@ -31,6 +31,7 @@ #endif #include "collectd.h" + #include "common.h" #include "plugin.h" @@ -48,11 +49,11 @@ typedef struct zone_stats { } zone_stats_t; 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); } @@ -133,7 +134,7 @@ zone_submit_values(c_avl_tree_t *tree) while (c_avl_pick (tree, (void **)&zoneid, (void **)&stats) == 0) { if (getzonenamebyid(*zoneid, zonename, sizeof( zonename )) == -1) { - WARNING("zone plugin: error retreiving zonename"); + WARNING("zone plugin: error retrieving zonename"); } else { zone_submit_value(zonename, (gauge_t)FRC2PCT(stats->pctcpu)); } @@ -152,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); }