X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fipmi.c;h=64651a24fcdb100ed563fd6df280210529cb762b;hb=f25d207699e013bb47c0083fe56b8358a98f6f4d;hp=b110920819575c7c0580f24ae2bd3c52183a6f61;hpb=94e53011cbe27743da2d9d4a8d3e0fa18fd2a931;p=collectd.git diff --git a/src/ipmi.c b/src/ipmi.c index b1109208..64651a24 100644 --- a/src/ipmi.c +++ b/src/ipmi.c @@ -49,12 +49,12 @@ typedef struct c_ipmi_sensor_list_s c_ipmi_sensor_list_t; 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 @@ struct c_ipmi_instance_s { 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; @@ -785,11 +785,9 @@ entity_sensor_update_handler(enum ipmi_update_e op, if (st->sel_enabled) { int status = 0; - /* register threshold event if threshold sensor support events */ - if ((ipmi_sensor_get_event_reading_type(sensor) == - IPMI_EVENT_READING_TYPE_THRESHOLD) && - (ipmi_sensor_get_threshold_access(sensor) != - IPMI_THRESHOLD_ACCESS_SUPPORT_NONE)) + /* register threshold event handler */ + if (ipmi_sensor_get_event_reading_type(sensor) == + IPMI_EVENT_READING_TYPE_THRESHOLD) status = ipmi_sensor_add_threshold_event_handler( sensor, sensor_threshold_event_handler, st); /* register discrete handler if discrete/specific sensor support events */ @@ -1067,7 +1065,7 @@ static int c_ipmi_config_add_instance(oconfig_item_t *ci) { if (strcasecmp("Sensor", child->key) == 0) ignorelist_add(st->ignorelist, child->values[0].value.string); else if (strcasecmp("IgnoreSelected", child->key) == 0) { - _Bool t; + bool t; status = cf_util_get_boolean(child, &t); if (status != 0) break; @@ -1126,7 +1124,7 @@ static int c_ipmi_config_add_instance(oconfig_item_t *ci) { } /* 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;