X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fcontextswitch.c;h=35ac5a397b03b1a095ac6199d5af48096546f0eb;hp=d91c0738fd0c77825a3e91b5c7a73755a9cea7de;hb=a9e50e9e30ecde17e167e271060c8183bfcbf407;hpb=2079ee1517e34de372f58e7e2267ad5c71a8a41f diff --git a/src/contextswitch.c b/src/contextswitch.c index d91c0738..35ac5a39 100644 --- a/src/contextswitch.c +++ b/src/contextswitch.c @@ -48,14 +48,10 @@ #endif static void cs_submit(derive_t context_switches) { - value_t values[1]; value_list_t vl = VALUE_LIST_INIT; - values[0].derive = (derive_t)context_switches; - - vl.values = values; + vl.values = &(value_t){.derive = context_switches}; vl.values_len = 1; - sstrncpy(vl.host, hostname_g, sizeof(vl.host)); sstrncpy(vl.plugin, "contextswitch", sizeof(vl.plugin)); sstrncpy(vl.type, "contextswitch", sizeof(vl.type)); @@ -73,7 +69,7 @@ static int cs_read(void) { if (status != 0) { ERROR("contextswitch plugin: sysctlbyname " "(vm.stats.sys.v_swtch) failed"); - return (-1); + return -1; } cs_submit(value); @@ -89,9 +85,8 @@ static int cs_read(void) { fh = fopen("/proc/stat", "r"); if (fh == NULL) { - ERROR("contextswitch plugin: unable to open /proc/stat: %s", - sstrerror(errno, buffer, sizeof(buffer))); - return (-1); + ERROR("contextswitch plugin: unable to open /proc/stat: %s", STRERRNO); + return -1; } while (fgets(buffer, sizeof(buffer), fh) != NULL) { @@ -130,10 +125,8 @@ static int cs_read(void) { status = perfstat_cpu_total(NULL, &perfcputotal, sizeof(perfstat_cpu_total_t), 1); if (status < 0) { - char errbuf[1024]; - ERROR("contextswitch plugin: perfstat_cpu_total: %s", - sstrerror(errno, errbuf, sizeof(errbuf))); - return (-1); + ERROR("contextswitch plugin: perfstat_cpu_total: %s", STRERRNO); + return -1; } cs_submit(perfcputotal.pswitch);