Merge branch 'collectd-4.3'

[collectd.git] / src / plugin.c

diff --git a/src/plugin.c b/src/plugin.c
index f590580..dfab52c 100644 (file)
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -328,7 +328,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 */
-       if (snprintf (typename, BUFSIZE, "%s.so", type) >= BUFSIZE)
+       if (ssnprintf (typename, sizeof (typename),
+                       "%s.so", type) >= sizeof (typename))
        {
                WARNING ("snprintf: truncated: `%s.so'", type);
                return (-1);
@@ -348,7 +349,8 @@ int plugin_load (const char *type)
                if (strncasecmp (de->d_name, typename, typename_len))
                        continue;
 
-               if (snprintf (filename, BUFSIZE, "%s/%s", dir, de->d_name) >= BUFSIZE)
+               if (ssnprintf (filename, sizeof (filename),
+                               "%s/%s", dir, de->d_name) >= sizeof (filename))
                {
                        WARNING ("snprintf: truncated: `%s/%s'", dir, de->d_name);
                        continue;
@@ -763,7 +765,7 @@ int plugin_dispatch_values (value_list_t *vl)
        assert (0 == strcmp (ds->type, vl->type));
 #else
        if (0 != strcmp (ds->type, vl->type))
-               WARN ("plugin_dispatch_values: (ds->type = %s) != (vl->type = %s)",
+               WARNING ("plugin_dispatch_values: (ds->type = %s) != (vl->type = %s)",
                                ds->type, vl->type);
 #endif