projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src/Makefile: Don't unnecessarily set plugin specific CXXFLAGS.
[collectd.git]
/
src
/
onewire.c
diff --git
a/src/onewire.c
b/src/onewire.c
index
58c35e1
..
42bd1eb
100644
(file)
--- a/
src/onewire.c
+++ b/
src/onewire.c
@@
-176,11
+176,11
@@
static int direct_list_insert(const char * config)
{
regmatch_t pmatch[3];
size_t nmatch = 3;
{
regmatch_t pmatch[3];
size_t nmatch = 3;
- direct_access_element_t *element
= NULL
;
+ direct_access_element_t *element;
DEBUG ("onewire plugin: direct_list_insert <%s>", config);
DEBUG ("onewire plugin: direct_list_insert <%s>", config);
- element =
(direct_access_element_t *) malloc (sizeof
(*element));
+ element =
malloc (sizeof
(*element));
if (element == NULL)
{
ERROR ("onewire plugin: direct_list_insert - cannot allocate element");
if (element == NULL)
{
ERROR ("onewire plugin: direct_list_insert - cannot allocate element");
@@
-415,11
+415,11
@@
static int cow_read_ds2409 (const char *path)
int status;
status = ssnprintf (subpath, sizeof (subpath), "%s/main", path);
int status;
status = ssnprintf (subpath, sizeof (subpath), "%s/main", path);
- if ((status > 0) && (status < sizeof (subpath)))
+ if ((status > 0) && (status <
(int)
sizeof (subpath)))
cow_read_bus (subpath);
status = ssnprintf (subpath, sizeof (subpath), "%s/aux", path);
cow_read_bus (subpath);
status = ssnprintf (subpath, sizeof (subpath), "%s/aux", path);
- if ((status > 0) && (status < sizeof (subpath)))
+ if ((status > 0) && (status <
(int)
sizeof (subpath)))
cow_read_bus (subpath);
return (0);
cow_read_bus (subpath);
return (0);
@@
-459,7
+459,7
@@
static int cow_read_bus (const char *path)
else
status = ssnprintf (subpath, sizeof (subpath), "%s/%s",
path, buffer_ptr);
else
status = ssnprintf (subpath, sizeof (subpath), "%s/%s",
path, buffer_ptr);
- if ((status <= 0) || (status >= sizeof (subpath)))
+ if ((status <= 0) || (status >=
(int)
sizeof (subpath)))
continue;
for (i = 0; i < ow_family_features_num; i++)
continue;
for (i = 0; i < ow_family_features_num; i++)