X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Femail.c;h=8a1ac2e8491cff6fd9a0917c1983861bc6a67b1d;hb=edd9af8a874ebc9f2a7f02846807229a648917db;hp=63b6a56bd9945fb047515c054854be1e1bf51920;hpb=ccc4feb9576f520596508418f404beb000fde1aa;p=collectd.git

diff --git a/src/email.c b/src/email.c
index 63b6a56b..8a1ac2e8 100644
--- a/src/email.c
+++ b/src/email.c
@@ -46,10 +46,6 @@
 
 #include <stddef.h>
 
-#if HAVE_LIBPTHREAD
-# include <pthread.h>
-#endif
-
 #include <sys/un.h>
 #include <sys/select.h>
 
@@ -219,7 +215,7 @@ static int email_config (const char *key, const char *value)
 static void type_list_incr (type_list_t *list, char *name, int incr)
 {
 	if (NULL == list->head) {
-		list->head = (type_t *)smalloc (sizeof (type_t));
+		list->head = smalloc (sizeof (*list->head));
 
 		list->head->name  = sstrdup (name);
 		list->head->value = incr;
@@ -236,7 +232,7 @@ static void type_list_incr (type_list_t *list, char *name, int incr)
 		}
 
 		if (NULL == ptr) {
-			list->tail->next = (type_t *)smalloc (sizeof (type_t));
+			list->tail->next = smalloc (sizeof (*list->tail->next));
 			list->tail = list->tail->next;
 
 			list->tail->name  = sstrdup (name);
@@ -389,8 +385,8 @@ static void *open_connection (void __attribute__((unused)) *arg)
 {
 	struct sockaddr_un addr;
 
-	char *path  = (NULL == sock_file) ? SOCK_PATH : sock_file;
-	char *group = (NULL == sock_group) ? COLLECTD_GRP_NAME : sock_group;
+	const char *path  = (NULL == sock_file) ? SOCK_PATH : sock_file;
+	const char *group = (NULL == sock_group) ? COLLECTD_GRP_NAME : sock_group;
 
 	/* create UNIX socket */
 	errno = 0;
@@ -482,10 +478,10 @@ static void *open_connection (void __attribute__((unused)) *arg)
 		available_collectors = max_conns;
 
 		collectors =
-			(collector_t **)smalloc (max_conns * sizeof (collector_t *));
+			smalloc (max_conns * sizeof (*collectors));
 
 		for (i = 0; i < max_conns; ++i) {
-			collectors[i] = (collector_t *)smalloc (sizeof (collector_t));
+			collectors[i] = smalloc (sizeof (*collectors[i]));
 			collectors[i]->socket = NULL;
 
 			if (0 != (err = plugin_thread_create (&collectors[i]->thread,
@@ -537,13 +533,12 @@ static void *open_connection (void __attribute__((unused)) *arg)
 			break;
 		}
 
-		connection = malloc (sizeof (*connection));
+		connection = calloc (1, sizeof (*connection));
 		if (connection == NULL)
 		{
 			close (remote);
 			continue;
 		}
-		memset (connection, 0, sizeof (*connection));
 
 		connection->socket = fdopen (remote, "r");
 		connection->next   = NULL;
@@ -695,7 +690,7 @@ static void copy_type_list (type_list_t *l1, type_list_t *l2)
 	for (ptr1 = l1->head, ptr2 = l2->head; NULL != ptr1;
 			ptr1 = ptr1->next, last = ptr2, ptr2 = ptr2->next) {
 		if (NULL == ptr2) {
-			ptr2 = (type_t *)smalloc (sizeof (type_t));
+			ptr2 = smalloc (sizeof (*ptr2));
 			ptr2->name = NULL;
 			ptr2->next = NULL;