Merge branch 'collectd-5.8'

Conflicts:
	src/ipmi.c

diff --combined src/ipmi.c
index 7f628bf,98cc3b0..67fd949
--- 1/src/ipmi.c
--- 2/src/ipmi.c
+++ b/src/ipmi.c
@@@ -49,12 -49,12 +49,12 @@@ typedef struct c_ipmi_sensor_list_s c_i
  struct c_ipmi_instance_s {
    char *name;
    ignorelist_t *ignorelist;
 -  _Bool notify_add;
 -  _Bool notify_remove;
 -  _Bool notify_notpresent;
 -  _Bool notify_conn;
 -  _Bool sel_enabled;
 -  _Bool sel_clear_event;
 +  bool notify_add;
 +  bool notify_remove;
 +  bool notify_notpresent;
 +  bool notify_conn;
 +  bool sel_enabled;
 +  bool sel_clear_event;
  
    char *host;
    char *connaddr;
@@@ -62,12 -62,12 +62,12 @@@
    char *password;
    unsigned int authtype;
  
 -  _Bool connected;
 +  bool connected;
    ipmi_con_t *connection;
    pthread_mutex_t sensor_list_lock;
    c_ipmi_sensor_list_t *sensor_list;
  
 -  _Bool active;
 +  bool active;
    pthread_t thread_id;
    int init_in_progress;
  
@@@ -95,8 -95,8 +95,8 @@@ typedef struct c_ipmi_db_type_map_s c_i
  /*
   * Module global variables
   */
 -static os_handler_t *os_handler = NULL;
 -static c_ipmi_instance_t *instances = NULL;
 +static os_handler_t *os_handler;
 +static c_ipmi_instance_t *instances;
  
  /*
   * Misc private functions
@@@ -884,7 -884,7 +884,7 @@@ static void domain_connection_change_ha
        plugin_dispatch_notification(&n);
      }
  
 -    st->connected = 0;
 +    st->connected = false;
      return;
    }
  
@@@ -896,7 -896,7 +896,7 @@@
      plugin_dispatch_notification(&n);
    }
  
 -  st->connected = 1;
 +  st->connected = true;
  
    int status = ipmi_domain_add_entity_update_handler(
        domain, domain_entity_update_handler, /* user data = */ st);
@@@ -965,11 -965,11 +965,11 @@@ static void *c_ipmi_thread_main(void *u
    int status = c_ipmi_thread_init(st);
    if (status != 0) {
      ERROR("ipmi plugin: c_ipmi_thread_init failed.");
 -    st->active = 0;
 +    st->active = false;
      return (void *)-1;
    }
  
 -  while (st->active != 0) {
 +  while (st->active) {
      struct timeval tv = {1, 0};
      os_handler->perform_one_op(os_handler, &tv);
    }
@@@ -1062,10 -1062,15 +1062,15 @@@ static int c_ipmi_config_add_instance(o
    for (int i = 0; i < ci->children_num; i++) {
      oconfig_item_t *child = ci->children + i;
  
-     if (strcasecmp("Sensor", child->key) == 0)
-       ignorelist_add(st->ignorelist, child->values[0].value.string);
-     else if (strcasecmp("IgnoreSelected", child->key) == 0) {
+     if (strcasecmp("Sensor", child->key) == 0) {
+       char *value = NULL;
+       status = cf_util_get_string(child, &value);
+       if (status != 0)
+         break;
+       ignorelist_add(st->ignorelist, value);
+       sfree(value);
+     } else if (strcasecmp("IgnoreSelected", child->key) == 0) {
 -      _Bool t;
 +      bool t;
        status = cf_util_get_boolean(child, &t);
        if (status != 0)
          break;
@@@ -1124,7 -1129,7 +1129,7 @@@
  } /* int c_ipmi_config_add_instance */
  
  static int c_ipmi_config(oconfig_item_t *ci) {
 -  _Bool have_instance_block = 0;
 +  bool have_instance_block = 0;
  
    for (int i = 0; i < ci->children_num; i++) {
      oconfig_item_t *child = ci->children + i;
@@@ -1158,12 -1163,12 +1163,12 @@@
  static int c_ipmi_read(user_data_t *user_data) {
    c_ipmi_instance_t *st = user_data->data;
  
 -  if (st->active == 0) {
 +  if (st->active == false) {
      INFO("ipmi plugin: c_ipmi_read: I'm not active, returning false.");
      return -1;
    }
  
 -  if (st->connected == 0)
 +  if (st->connected == false)
      return 0;
  
    sensor_list_read_all(st);
@@@ -1234,14 -1239,14 +1239,14 @@@ static int c_ipmi_init(void) 
      }
  
      st->init_in_progress = cycles;
 -    st->active = 1;
 +    st->active = true;
  
      status = plugin_thread_create(&st->thread_id, /* attr = */ NULL,
                                    c_ipmi_thread_main,
                                    /* user data = */ (void *)st, "ipmi");
  
      if (status != 0) {
 -      st->active = 0;
 +      st->active = false;
        st->thread_id = (pthread_t){0};
  
        plugin_unregister_read(callback_name);
@@@ -1263,7 -1268,7 +1268,7 @@@ static int c_ipmi_shutdown(void) 
      c_ipmi_instance_t *next = st->next;
  
      st->next = NULL;
 -    st->active = 0;
 +    st->active = false;
  
      if (!pthread_equal(st->thread_id, (pthread_t){0})) {
        pthread_join(st->thread_id, NULL);