X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fswap.c;h=dfca67b490eb59cc29407f6e55a63965aaedc464;hp=78f05c5f968971ac961c3637935e6aaa7f55108c;hb=a9e50e9e30ecde17e167e271060c8183bfcbf407;hpb=a1b19a64325554b0410daaefed3ce229b34958b7 diff --git a/src/swap.c b/src/swap.c index 78f05c5f..dfca67b4 100644 --- a/src/swap.c +++ b/src/swap.c @@ -234,9 +234,7 @@ static int swap_read_separate(void) /* {{{ */ fh = fopen("/proc/swaps", "r"); if (fh == NULL) { - char errbuf[1024]; - WARNING("swap plugin: fopen (/proc/swaps) failed: %s", - sstrerror(errno, errbuf, sizeof(errbuf))); + WARNING("swap plugin: fopen (/proc/swaps) failed: %s", STRERRNO); return -1; } @@ -291,9 +289,7 @@ static int swap_read_combined(void) /* {{{ */ fh = fopen("/proc/meminfo", "r"); if (fh == NULL) { - char errbuf[1024]; - WARNING("swap plugin: fopen (/proc/meminfo) failed: %s", - sstrerror(errno, errbuf, sizeof(errbuf))); + WARNING("swap plugin: fopen (/proc/meminfo) failed: %s", STRERRNO); return -1; } @@ -350,8 +346,7 @@ static int swap_read_io(void) /* {{{ */ /* /proc/vmstat does not exist in kernels <2.6 */ fh = fopen("/proc/stat", "r"); if (fh == NULL) { - char errbuf[1024]; - WARNING("swap: fopen: %s", sstrerror(errno, errbuf, sizeof(errbuf))); + WARNING("swap: fopen: %s", STRERRNO); return -1; } else old_kernel = 1; @@ -436,9 +431,7 @@ static int swap_read_kstat(void) /* {{{ */ struct anoninfo ai; if (swapctl(SC_AINFO, &ai) == -1) { - char errbuf[1024]; - ERROR("swap plugin: swapctl failed: %s", - sstrerror(errno, errbuf, sizeof(errbuf))); + ERROR("swap plugin: swapctl failed: %s", STRERRNO); return -1; } @@ -513,9 +506,7 @@ static int swap_read(void) /* {{{ */ status = swapctl(SC_LIST, s); if (status < 0) { - char errbuf[1024]; - ERROR("swap plugin: swapctl (SC_LIST) failed: %s", - sstrerror(errno, errbuf, sizeof(errbuf))); + ERROR("swap plugin: swapctl (SC_LIST) failed: %s", STRERRNO); sfree(s_paths); sfree(s); return -1; @@ -719,9 +710,7 @@ static int swap_read(void) /* {{{ */ status = perfstat_memory_total(NULL, &pmemory, sizeof(perfstat_memory_total_t), 1); if (status < 0) { - char errbuf[1024]; - WARNING("swap plugin: perfstat_memory_total failed: %s", - sstrerror(errno, errbuf, sizeof(errbuf))); + WARNING("swap plugin: perfstat_memory_total failed: %s", STRERRNO); return -1; }