projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
daemon: Check if plugin actually loaded before reporting configuration issues
[collectd.git]
/
src
/
onewire.c
diff --git
a/src/onewire.c
b/src/onewire.c
index
575a682
..
729a05c
100644
(file)
--- a/
src/onewire.c
+++ b/
src/onewire.c
@@
-21,9
+21,9
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
#include "plugin.h"
#include "plugin.h"
-#include "utils_ignorelist.h"
+#include "utils/common/common.h"
+#include "utils/ignorelist/ignorelist.h"
#include <owcapi.h>
#include <regex.h>
#include <owcapi.h>
#include <regex.h>
@@
-297,8
+297,8
@@
static int cow_read_values(const char *path, const char *name,
char file[4096];
char *endptr;
char file[4096];
char *endptr;
- snprintf(file, sizeof(file), "%s/%s", path,
- family_info->features[i].filename);
+ s
s
nprintf(file, sizeof(file), "%s/%s", path,
+
family_info->features[i].filename);
file[sizeof(file) - 1] = '\0';
buffer = NULL;
file[sizeof(file) - 1] = '\0';
buffer = NULL;
@@
-348,11
+348,11
@@
static int cow_read_ds2409(const char *path) {
char subpath[4096];
int status;
char subpath[4096];
int status;
- status = snprintf(subpath, sizeof(subpath), "%s/main", path);
+ status = s
s
nprintf(subpath, sizeof(subpath), "%s/main", path);
if ((status > 0) && (status < (int)sizeof(subpath)))
cow_read_bus(subpath);
if ((status > 0) && (status < (int)sizeof(subpath)))
cow_read_bus(subpath);
- status = snprintf(subpath, sizeof(subpath), "%s/aux", path);
+ status = s
s
nprintf(subpath, sizeof(subpath), "%s/aux", path);
if ((status > 0) && (status < (int)sizeof(subpath)))
cow_read_bus(subpath);
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)
dummy = NULL;
if (strcmp("/", path) == 0)
- status = snprintf(subpath, sizeof(subpath), "/%s", buffer_ptr);
+ status = s
s
nprintf(subpath, sizeof(subpath), "/%s", buffer_ptr);
else
else
- status = snprintf(subpath, sizeof(subpath), "%s/%s", path, buffer_ptr);
+ status = s
s
nprintf(subpath, sizeof(subpath), "%s/%s", path, buffer_ptr);
if ((status <= 0) || (status >= (int)sizeof(subpath)))
continue;
if ((status <= 0) || (status >= (int)sizeof(subpath)))
continue;