X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Femail.c;h=334e8764bb3de27a7bfa843adf6d88ae2616a166;hb=0a8741b9061f8df4a78a448c021612db06e17425;hp=8a1ac2e8491cff6fd9a0917c1983861bc6a67b1d;hpb=38909dcf1dcb596c5f525c6bb25cf89c046013b5;p=collectd.git

diff --git a/src/email.c b/src/email.c
index 8a1ac2e8..334e8764 100644
--- a/src/email.c
+++ b/src/email.c
@@ -39,11 +39,10 @@
  */
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
-#include "configfile.h"
-
 #include <stddef.h>
 
 #include <sys/un.h>
@@ -464,9 +463,6 @@ static void *open_connection (void __attribute__((unused)) *arg)
 	}
 
 	{ /* initialize collector threads */
-		int i   = 0;
-		int err = 0;
-
 		pthread_attr_t ptattr;
 
 		conns.head = NULL;
@@ -480,14 +476,15 @@ static void *open_connection (void __attribute__((unused)) *arg)
 		collectors =
 			smalloc (max_conns * sizeof (*collectors));
 
-		for (i = 0; i < max_conns; ++i) {
+		for (int i = 0; i < max_conns; ++i) {
 			collectors[i] = smalloc (sizeof (*collectors[i]));
 			collectors[i]->socket = NULL;
 
-			if (0 != (err = plugin_thread_create (&collectors[i]->thread,
-							&ptattr, collect, collectors[i]))) {
+			if (plugin_thread_create (&collectors[i]->thread,
+							&ptattr, collect, collectors[i],
+							"email collector") != 0) {
 				char errbuf[1024];
-				log_err ("pthread_create() failed: %s",
+				log_err ("plugin_thread_create() failed: %s",
 						sstrerror (errno, errbuf, sizeof (errbuf)));
 				collectors[i]->thread = (pthread_t) 0;
 			}
@@ -571,13 +568,11 @@ static void *open_connection (void __attribute__((unused)) *arg)
 
 static int email_init (void)
 {
-	int err = 0;
-
-	if (0 != (err = plugin_thread_create (&connector, NULL,
-				open_connection, NULL))) {
+	if (plugin_thread_create (&connector, NULL,
+				open_connection, NULL, "email listener") != 0) {
 		char errbuf[1024];
 		disabled = 1;
-		log_err ("pthread_create() failed: %s",
+		log_err ("plugin_thread_create() failed: %s",
 				sstrerror (errno, errbuf, sizeof (errbuf)));
 		return (-1);
 	}
@@ -606,8 +601,6 @@ static void type_list_free (type_list_t *t)
 
 static int email_shutdown (void)
 {
-	int i = 0;
-
 	if (connector != ((pthread_t) 0)) {
 		pthread_kill (connector, SIGTERM);
 		connector = (pthread_t) 0;
@@ -624,7 +617,7 @@ static int email_shutdown (void)
 	available_collectors = 0;
 
 	if (collectors != NULL) {
-		for (i = 0; i < max_conns; ++i) {
+		for (int i = 0; i < max_conns; ++i) {
 			if (collectors[i] == NULL)
 				continue;
 
@@ -661,14 +654,10 @@ static int email_shutdown (void)
 
 static void email_submit (const char *type, const char *type_instance, gauge_t value)
 {
-	value_t values[1];
 	value_list_t vl = VALUE_LIST_INIT;
 
-	values[0].gauge = value;
-
-	vl.values = values;
+	vl.values = &(value_t) { .gauge = value };
 	vl.values_len = 1;
-	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "email", sizeof (vl.plugin));
 	sstrncpy (vl.type, type, sizeof (vl.type));
 	sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
@@ -682,12 +671,9 @@ static void email_submit (const char *type, const char *type_instance, gauge_t v
  * after they have been copied to l2. */
 static void copy_type_list (type_list_t *l1, type_list_t *l2)
 {
-	type_t *ptr1;
-	type_t *ptr2;
-
 	type_t *last = NULL;
 
-	for (ptr1 = l1->head, ptr2 = l2->head; NULL != ptr1;
+	for (type_t *ptr1 = l1->head, *ptr2 = l2->head; NULL != ptr1;
 			ptr1 = ptr1->next, last = ptr2, ptr2 = ptr2->next) {
 		if (NULL == ptr2) {
 			ptr2 = smalloc (sizeof (*ptr2));
@@ -716,8 +702,6 @@ static void copy_type_list (type_list_t *l1, type_list_t *l2)
 
 static int email_read (void)
 {
-	type_t *ptr;
-
 	double score_old;
 	int score_count_old;
 
@@ -731,7 +715,7 @@ static int email_read (void)
 
 	pthread_mutex_unlock (&count_mutex);
 
-	for (ptr = list_count_copy.head; NULL != ptr; ptr = ptr->next) {
+	for (type_t *ptr = list_count_copy.head; NULL != ptr; ptr = ptr->next) {
 		email_submit ("email_count", ptr->name, ptr->value);
 	}
 
@@ -742,7 +726,7 @@ static int email_read (void)
 
 	pthread_mutex_unlock (&size_mutex);
 
-	for (ptr = list_size_copy.head; NULL != ptr; ptr = ptr->next) {
+	for (type_t *ptr = list_size_copy.head; NULL != ptr; ptr = ptr->next) {
 		email_submit ("email_size", ptr->name, ptr->value);
 	}
 
@@ -766,7 +750,7 @@ static int email_read (void)
 
 	pthread_mutex_unlock (&check_mutex);
 
-	for (ptr = list_check_copy.head; NULL != ptr; ptr = ptr->next)
+	for (type_t *ptr = list_check_copy.head; NULL != ptr; ptr = ptr->next)
 		email_submit ("spam_check", ptr->name, ptr->value);
 
 	return (0);