X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fvirt.c;h=16bb77b101505cdd592977736248be540148cf1d;hb=71bbf854d3e6f8c6d6c3582527263bb01a3a7e04;hp=6824b134aeed727de314b5006fee3f14477ae6f5;hpb=ca4a6c8a856a9012270ec10389b08d54e70e3401;p=collectd.git diff --git a/src/virt.c b/src/virt.c index 6824b134..16bb77b1 100644 --- a/src/virt.c +++ b/src/virt.c @@ -327,8 +327,8 @@ lv_init (void) { if (virInitialize () != 0) return -1; - - return 0; + else + return 0; } static int @@ -587,7 +587,7 @@ lv_read (void) continue; } - status = virDomainMemoryStats (domains[i], minfo, VIR_DOMAIN_MEMORY_STAT_NR, 0); + status = virDomainMemoryStats (domains[i], minfo, VIR_DOMAIN_MEMORY_STAT_NR, 0); if (status < 0) { ERROR ("virt plugin: virDomainMemoryStats failed with status %i.", @@ -686,8 +686,8 @@ refresh_lists (void) int *domids; /* Get list of domains. */ - domids = malloc (sizeof (int) * n); - if (domids == 0) { + domids = malloc (sizeof (*domids) * n); + if (domids == NULL) { ERROR (PLUGIN_NAME " plugin: malloc failed."); return -1; } @@ -833,7 +833,7 @@ refresh_lists (void) } static void -free_domains () +free_domains (void) { int i; @@ -866,7 +866,7 @@ add_domain (virDomainPtr dom) } static void -free_block_devices () +free_block_devices (void) { int i; @@ -906,7 +906,7 @@ add_block_device (virDomainPtr dom, const char *path) } static void -free_interface_devices () +free_interface_devices (void) { int i;