X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmcelog.c;h=d71195f0cf7e6d3f47809b32a86f7dff7fea8372;hb=21c84cec32921e6de8feaa5496f337496379ea23;hp=1a92a065eeda129ebbe55e2d6224bdcf31e28d52;hpb=358bf39b09f69220fc8e1b6c2fe98e5e185e3364;p=collectd.git diff --git a/src/mcelog.c b/src/mcelog.c index 1a92a065..d71195f0 100644 --- a/src/mcelog.c +++ b/src/mcelog.c @@ -31,7 +31,7 @@ #include "collectd.h" -#include "common.h" +#include "utils/common/common.h" #include "utils_llist.h" #include @@ -56,7 +56,7 @@ typedef struct mcelog_config_s { pthread_t tid; /* poll thread id */ llist_t *dimms_list; /* DIMMs list */ pthread_mutex_t dimms_lock; /* lock for dimms cache */ - _Bool persist; + bool persist; } mcelog_config_t; typedef struct socket_adapter_s socket_adapter_t; @@ -90,14 +90,16 @@ static int socket_reinit(socket_adapter_t *self); static int socket_receive(socket_adapter_t *self, FILE **p_file); static mcelog_config_t g_mcelog_config = { - .logfile = "/var/log/mcelog", .persist = 0, + .logfile = "/var/log/mcelog", + .persist = false, }; static socket_adapter_t socket_adapter = { .sock_fd = -1, .unix_sock = { - .sun_family = AF_UNIX, .sun_path = "/var/run/mcelog-client", + .sun_family = AF_UNIX, + .sun_path = "/var/run/mcelog-client", }, .lock = PTHREAD_RWLOCK_INITIALIZER, .close = socket_close, @@ -106,8 +108,8 @@ static socket_adapter_t socket_adapter = { .receive = socket_receive, }; -static _Bool mcelog_thread_running; -static _Bool mcelog_apply_defaults; +static bool mcelog_thread_running; +static bool mcelog_apply_defaults; static void mcelog_free_dimms_list_records(llist_t *dimms_list) { @@ -523,7 +525,8 @@ static int socket_receive(socket_adapter_t *self, FILE **pp_file) { int res = -1; pthread_rwlock_rdlock(&self->lock); struct pollfd poll_fd = { - .fd = self->sock_fd, .events = POLLIN | POLLPRI, + .fd = self->sock_fd, + .events = POLLIN | POLLPRI, }; if ((res = poll(&poll_fd, 1, MCELOG_POLL_TIMEOUT)) <= 0) {