projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src/plugin.c: Emit warning in load_plugin if !S_ISREG
[collectd.git]
/
src
/
plugin.c
diff --git
a/src/plugin.c
b/src/plugin.c
index
2316c08
..
20f3aa2
100644
(file)
--- a/
src/plugin.c
+++ b/
src/plugin.c
@@
-149,14
+149,14
@@
static int plugin_load_file (char *file)
{
const char *error = lt_dlerror ();
{
const char *error = lt_dlerror ();
- ERROR ("lt_dlopen
failed: %s"
, error);
- fprintf (stderr, "lt_dlopen
failed: %s\n"
, error);
+ ERROR ("lt_dlopen
(%s) failed: %s", file
, error);
+ fprintf (stderr, "lt_dlopen
(%s) failed: %s\n", file
, error);
return (1);
}
if ((reg_handle = (void (*) (void)) lt_dlsym (dlh, "module_register")) == NULL)
{
return (1);
}
if ((reg_handle = (void (*) (void)) lt_dlsym (dlh, "module_register")) == NULL)
{
- WARNING ("Couldn't find symbol `
`module_register'' in ``%s'
': %s\n",
+ WARNING ("Couldn't find symbol `
module_register' in `%s
': %s\n",
file, lt_dlerror ());
lt_dlclose (dlh);
return (-1);
file, lt_dlerror ());
lt_dlclose (dlh);
return (-1);
@@
-367,6
+367,7
@@
int plugin_load (const char *type)
else if (!S_ISREG (statbuf.st_mode))
{
/* don't follow symlinks */
else if (!S_ISREG (statbuf.st_mode))
{
/* don't follow symlinks */
+ WARNING ("stat %s: not a regular file", filename);
continue;
}
continue;
}
@@
-830,7
+831,7
@@
int plugin_dispatch_notification (const notification_t *notif)
void plugin_log (int level, const char *format, ...)
{
void plugin_log (int level, const char *format, ...)
{
- char msg[
512
];
+ char msg[
1024
];
va_list ap;
void (*callback) (int, const char *);
va_list ap;
void (*callback) (int, const char *);
@@
-845,8
+846,8
@@
void plugin_log (int level, const char *format, ...)
#endif
va_start (ap, format);
#endif
va_start (ap, format);
- vsnprintf (msg,
512
, format, ap);
- msg[
51
1] = '\0';
+ vsnprintf (msg,
sizeof (msg)
, format, ap);
+ msg[
sizeof (msg) -
1] = '\0';
va_end (ap);
le = llist_head (list_log);
va_end (ap);
le = llist_head (list_log);
@@
-901,8
+902,8
@@
static int plugin_notification_meta_add (notification_t *n,
{
case NM_TYPE_STRING:
{
{
case NM_TYPE_STRING:
{
- meta->
value
_string = strdup ((const char *) value);
- if (meta->
value
_string == NULL)
+ meta->
nm_value.nm
_string = strdup ((const char *) value);
+ if (meta->
nm_value.nm
_string == NULL)
{
ERROR ("plugin_notification_meta_add: strdup failed.");
sfree (meta);
{
ERROR ("plugin_notification_meta_add: strdup failed.");
sfree (meta);
@@
-912,22
+913,22
@@
static int plugin_notification_meta_add (notification_t *n,
}
case NM_TYPE_SIGNED_INT:
{
}
case NM_TYPE_SIGNED_INT:
{
- meta->
value
_signed_int = *((int64_t *) value);
+ meta->
nm_value.nm
_signed_int = *((int64_t *) value);
break;
}
case NM_TYPE_UNSIGNED_INT:
{
break;
}
case NM_TYPE_UNSIGNED_INT:
{
- meta->
value
_unsigned_int = *((uint64_t *) value);
+ meta->
nm_value.nm
_unsigned_int = *((uint64_t *) value);
break;
}
case NM_TYPE_DOUBLE:
{
break;
}
case NM_TYPE_DOUBLE:
{
- meta->
value
_double = *((double *) value);
+ meta->
nm_value.nm
_double = *((double *) value);
break;
}
case NM_TYPE_BOOLEAN:
{
break;
}
case NM_TYPE_BOOLEAN:
{
- meta->
value
_boolean = *((bool *) value);
+ meta->
nm_value.nm
_boolean = *((bool *) value);
break;
}
default:
break;
}
default:
@@
-1000,19
+1001,19
@@
int plugin_notification_meta_copy (notification_t *dst,
{
if (meta->type == NM_TYPE_STRING)
plugin_notification_meta_add_string (dst, meta->name,
{
if (meta->type == NM_TYPE_STRING)
plugin_notification_meta_add_string (dst, meta->name,
- meta->
value
_string);
+ meta->
nm_value.nm
_string);
else if (meta->type == NM_TYPE_SIGNED_INT)
plugin_notification_meta_add_signed_int (dst, meta->name,
else if (meta->type == NM_TYPE_SIGNED_INT)
plugin_notification_meta_add_signed_int (dst, meta->name,
- meta->
value
_signed_int);
+ meta->
nm_value.nm
_signed_int);
else if (meta->type == NM_TYPE_UNSIGNED_INT)
plugin_notification_meta_add_unsigned_int (dst, meta->name,
else if (meta->type == NM_TYPE_UNSIGNED_INT)
plugin_notification_meta_add_unsigned_int (dst, meta->name,
- meta->
value
_unsigned_int);
+ meta->
nm_value.nm
_unsigned_int);
else if (meta->type == NM_TYPE_DOUBLE)
plugin_notification_meta_add_double (dst, meta->name,
else if (meta->type == NM_TYPE_DOUBLE)
plugin_notification_meta_add_double (dst, meta->name,
- meta->
value
_double);
+ meta->
nm_value.nm
_double);
else if (meta->type == NM_TYPE_BOOLEAN)
plugin_notification_meta_add_boolean (dst, meta->name,
else if (meta->type == NM_TYPE_BOOLEAN)
plugin_notification_meta_add_boolean (dst, meta->name,
- meta->
value
_boolean);
+ meta->
nm_value.nm
_boolean);
}
return (0);
}
return (0);
@@
-1037,8
+1038,8
@@
int plugin_notification_meta_free (notification_t *n)
if (this->type == NM_TYPE_STRING)
{
if (this->type == NM_TYPE_STRING)
{
- free ((char *)this->
value
_string);
- this->
value
_string = NULL;
+ free ((char *)this->
nm_value.nm
_string);
+ this->
nm_value.nm
_string = NULL;
}
sfree (this);
}
sfree (this);