X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Femail.c;h=376dd6a53dd6a61ad99e5df488671b0c573f5ccc;hb=614660f40c32b5af9b6c4852e4e370fc3953a5c8;hp=cb30a0eaf9ca42b73cccd2b19673d18ade2f15b4;hpb=109aa67e9a982321af6547b92b5b2b6c8ae2c244;p=collectd.git diff --git a/src/email.c b/src/email.c index cb30a0ea..376dd6a5 100644 --- a/src/email.c +++ b/src/email.c @@ -111,13 +111,13 @@ static const char *config_keys[] = {"SocketFile", "SocketGroup", "SocketPerms", static int config_keys_num = STATIC_ARRAY_SIZE(config_keys); /* socket configuration */ -static char *sock_file = NULL; -static char *sock_group = NULL; +static char *sock_file; +static char *sock_group; static int sock_perms = S_IRWXU | S_IRWXG; static int max_conns = MAX_CONNS; /* state of the plugin */ -static int disabled = 0; +static int disabled; /* thread managing "client" connections */ static pthread_t connector = (pthread_t)0; @@ -134,7 +134,7 @@ static conn_list_t conns; static pthread_cond_t collector_available = PTHREAD_COND_INITIALIZER; /* collector threads */ -static collector_t **collectors = NULL; +static collector_t **collectors; static pthread_mutex_t available_mutex = PTHREAD_MUTEX_INITIALIZER; static int available_collectors; @@ -274,7 +274,7 @@ static void *collect(void *arg) { len = strlen(line); if ((line[len - 1] != '\n') && (line[len - 1] != '\r')) { - log_warn("collect: line too long (> %zu characters): " + log_warn("collect: line too long (> %" PRIsz " characters): " "'%s' (truncated)", sizeof(line) - 1, line);