Merge branch 'collectd-4.0'

diff --combined src/plugin.c
index bed26f0,fe7a9e5..248e583
--- 1/src/plugin.c
--- 2/src/plugin.c
+++ b/src/plugin.c
@@@ -133,7 -133,6 +133,6 @@@ static int plugin_load_file (char *file
                const char *error = lt_dlerror ();
  
                ERROR ("lt_dlopen failed: %s", error);
-               DEBUG ("lt_dlopen failed: %s", error);
                return (1);
        }
  
@@@ -194,7 -193,7 +193,7 @@@ static void *plugin_read_thread (void *
                                        rf->wait_time = 86400;
  
                                NOTICE ("read-function of plugin `%s' "
 -                                              "failed. Will syspend it for %i "
 +                                              "failed. Will suspend it for %i "
                                                "seconds.", le->key, rf->wait_left);
                        }
                        else
@@@ -374,12 -373,6 +373,12 @@@ int plugin_register_config (const char 
        return (0);
  } /* int plugin_register_config */
  
 +int plugin_register_complex_config (const char *type,
 +              int (*callback) (oconfig_item_t *))
 +{
 +      return (cf_register_complex (type, callback));
 +} /* int plugin_register_complex_config */
 +
  int plugin_register_init (const char *name,
                int (*callback) (void))
  {
@@@ -464,12 -457,6 +463,12 @@@ int plugin_unregister_config (const cha
        return (0);
  } /* int plugin_unregister_config */
  
 +int plugin_unregister_complex_config (const char *name)
 +{
 +      cf_unregister_complex (name);
 +      return (0);
 +} /* int plugin_unregister_complex_config */
 +
  int plugin_unregister_init (const char *name)
  {
        return (plugin_unregister (list_init, name));