Merge branch 'master' of git://git.verplant.org/collectd

diff --combined src/plugin.c
index 2316c08,8f1974f..2b5a34d
--- 1/src/plugin.c
--- 2/src/plugin.c
+++ b/src/plugin.c
@@@ -149,14 -149,14 +149,14 @@@ static int plugin_load_file (char *file
        {
                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)
        {
-               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);
@@@ -677,7 -677,7 +677,7 @@@ int plugin_flush (const char *plugin, i
    while (le != NULL)
    {
      if ((plugin != NULL)
 -      && (strcmp (plugin, le->key) != 0))
 +        && (strcmp (plugin, le->key) != 0))
      {
        le = le->next;
        continue;
@@@ -873,9 -873,9 +873,9 @@@ const data_set_t *plugin_get_ds (const 
  } /* data_set_t *plugin_get_ds */
  
  static int plugin_notification_meta_add (notification_t *n,
 -              const char *name,
 -              enum notification_meta_type_e type,
 -              const void *value)
 +    const char *name,
 +    enum notification_meta_type_e type,
 +    const void *value)
  {
    notification_meta_t *meta;
    notification_meta_t *tail;
@@@ -1000,19 -1000,19 +1000,19 @@@ int plugin_notification_meta_copy (noti
    {
      if (meta->type == NM_TYPE_STRING)
        plugin_notification_meta_add_string (dst, meta->name,
 -        meta->value_string);
 +          meta->value_string);
      else if (meta->type == NM_TYPE_SIGNED_INT)
        plugin_notification_meta_add_signed_int (dst, meta->name,
 -        meta->value_signed_int);
 +          meta->value_signed_int);
      else if (meta->type == NM_TYPE_UNSIGNED_INT)
        plugin_notification_meta_add_unsigned_int (dst, meta->name,
 -        meta->value_unsigned_int);
 +          meta->value_unsigned_int);
      else if (meta->type == NM_TYPE_DOUBLE)
        plugin_notification_meta_add_double (dst, meta->name,
 -        meta->value_double);
 +          meta->value_double);
      else if (meta->type == NM_TYPE_BOOLEAN)
        plugin_notification_meta_add_boolean (dst, meta->name,
 -        meta->value_boolean);
 +          meta->value_boolean);
    }
  
    return (0);