projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed various signedness issues identified by -Wextra.
[collectd.git]
/
src
/
plugin.c
diff --git
a/src/plugin.c
b/src/plugin.c
index
9d558cb
..
61cc09c
100644
(file)
--- a/
src/plugin.c
+++ b/
src/plugin.c
@@
-328,6
+328,7
@@
int plugin_load (const char *type)
int ret;
struct stat statbuf;
struct dirent *de;
int ret;
struct stat statbuf;
struct dirent *de;
+ int status;
DEBUG ("type = %s", type);
DEBUG ("type = %s", type);
@@
-336,8
+337,8
@@
int plugin_load (const char *type)
/* `cpu' should not match `cpufreq'. To solve this we add `.so' to the
* type when matching the filename */
/* `cpu' should not match `cpufreq'. To solve this we add `.so' to the
* type when matching the filename */
- if (ssnprintf (typename, sizeof (typename),
-
"%s.so", type) >= sizeof (typename
))
+ status = ssnprintf (typename, sizeof (typename), "%s.so", type);
+
if ((status < 0) || ((size_t) status >= sizeof (typename)
))
{
WARNING ("snprintf: truncated: `%s.so'", type);
return (-1);
{
WARNING ("snprintf: truncated: `%s.so'", type);
return (-1);
@@
-357,8
+358,9
@@
int plugin_load (const char *type)
if (strncasecmp (de->d_name, typename, typename_len))
continue;
if (strncasecmp (de->d_name, typename, typename_len))
continue;
- if (ssnprintf (filename, sizeof (filename),
- "%s/%s", dir, de->d_name) >= sizeof (filename))
+ status = ssnprintf (filename, sizeof (filename),
+ "%s/%s", dir, de->d_name);
+ if ((status < 0) || ((size_t) status >= sizeof (filename)))
{
WARNING ("snprintf: truncated: `%s/%s'", dir, de->d_name);
continue;
{
WARNING ("snprintf: truncated: `%s/%s'", dir, de->d_name);
continue;