X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fsensors.c;h=4d8e92569b84a31752087f0bb9e632dd8852c8b4;hb=61a4ed99b1a5b6d371bb745933d0efc5dff9505c;hp=ed87c30c251318a543a07a229bd48a81dd62931a;hpb=867ad628dc6fcd05bd584b605d7093cfc00c3d07;p=collectd.git diff --git a/src/sensors.c b/src/sensors.c index ed87c30c..4d8e9256 100644 --- a/src/sensors.c +++ b/src/sensors.c @@ -158,7 +158,7 @@ typedef struct featurelist { } featurelist_t; static char *conffile = NULL; -static _Bool use_labels = 0; +static bool use_labels = 0; /* #endif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */ #else /* if SENSORS_API_VERSION >= 0x500 */ @@ -176,7 +176,7 @@ static int sensors_snprintf_chip_name(char *buf, size_t buf_size, int status = -1; if (chip->bus == SENSORS_CHIP_NAME_BUS_ISA) { - status = ssnprintf(buf, buf_size, "%s-isa-%04x", chip->prefix, chip->addr); + status = snprintf(buf, buf_size, "%s-isa-%04x", chip->prefix, chip->addr); } else if (chip->bus == SENSORS_CHIP_NAME_BUS_DUMMY) { status = snprintf(buf, buf_size, "%s-%s-%04x", chip->prefix, chip->busname, chip->addr); @@ -269,9 +269,7 @@ static int sensors_load_conf(void) { if (conffile != NULL) { fh = fopen(conffile, "r"); if (fh == NULL) { - char errbuf[1024]; - ERROR("sensors plugin: fopen(%s) failed: %s", conffile, - sstrerror(errno, errbuf, sizeof(errbuf))); + ERROR("sensors plugin: fopen(%s) failed: %s", conffile, STRERRNO); return -1; } } @@ -436,8 +434,8 @@ static void sensors_submit(const char *plugin_instance, const char *type, value_list_t vl = VALUE_LIST_INIT; - status = ssnprintf(match_key, sizeof(match_key), "%s/%s-%s", plugin_instance, - type, type_instance); + status = snprintf(match_key, sizeof(match_key), "%s/%s-%s", plugin_instance, + type, type_instance); if (status < 1) return;