X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fonewire.c;h=729a05c7bcbe2b749c5fa56ae7eac27c8d2d58c9;hb=39049b56158161b4f9eeacdad8918bcf0f1f7e90;hp=575a682082d3a4588230d7215db3e2e4ed3bf2e5;hpb=a96e1c4a5e2c0244607b9da71175c2a12a4451fd;p=collectd.git diff --git a/src/onewire.c b/src/onewire.c index 575a6820..729a05c7 100644 --- a/src/onewire.c +++ b/src/onewire.c @@ -21,9 +21,9 @@ #include "collectd.h" -#include "common.h" #include "plugin.h" -#include "utils_ignorelist.h" +#include "utils/common/common.h" +#include "utils/ignorelist/ignorelist.h" #include #include @@ -297,8 +297,8 @@ static int cow_read_values(const char *path, const char *name, char file[4096]; char *endptr; - snprintf(file, sizeof(file), "%s/%s", path, - family_info->features[i].filename); + ssnprintf(file, sizeof(file), "%s/%s", path, + family_info->features[i].filename); file[sizeof(file) - 1] = '\0'; buffer = NULL; @@ -348,11 +348,11 @@ static int cow_read_ds2409(const char *path) { char subpath[4096]; int status; - status = snprintf(subpath, sizeof(subpath), "%s/main", path); + status = ssnprintf(subpath, sizeof(subpath), "%s/main", path); if ((status > 0) && (status < (int)sizeof(subpath))) cow_read_bus(subpath); - status = snprintf(subpath, sizeof(subpath), "%s/aux", path); + status = ssnprintf(subpath, sizeof(subpath), "%s/aux", path); if ((status > 0) && (status < (int)sizeof(subpath))) cow_read_bus(subpath); @@ -384,9 +384,9 @@ static int cow_read_bus(const char *path) { dummy = NULL; if (strcmp("/", path) == 0) - status = snprintf(subpath, sizeof(subpath), "/%s", buffer_ptr); + status = ssnprintf(subpath, sizeof(subpath), "/%s", buffer_ptr); else - status = snprintf(subpath, sizeof(subpath), "%s/%s", path, buffer_ptr); + status = ssnprintf(subpath, sizeof(subpath), "%s/%s", path, buffer_ptr); if ((status <= 0) || (status >= (int)sizeof(subpath))) continue;