X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fnetwork.c;h=219f163eadbac1030f5b8f652cf1eaf9090d11f8;hb=c89182b424bb4184bd7da3f2ab687b542ed7eea3;hp=086f04eccd28700327e472e60394d0e61db0d50c;hpb=6894d846ac42cbe88073db074d75279f5a6e31b8;p=collectd.git

diff --git a/src/network.c b/src/network.c
index 086f04ec..219f163e 100644
--- a/src/network.c
+++ b/src/network.c
@@ -36,9 +36,6 @@
 
 #include "network.h"
 
-#if HAVE_PTHREAD_H
-# include <pthread.h>
-#endif
 #if HAVE_NETDB_H
 # include <netdb.h>
 #endif
@@ -56,7 +53,6 @@
 #endif
 
 #if HAVE_LIBGCRYPT
-# include <pthread.h>
 # if defined __APPLE__
 /* default xcode compiler throws warnings even when deprecated functionality
  * is not used. -Werror breaks the build because of erroneous warnings.
@@ -618,14 +614,14 @@ static int write_part_values (char **ret_buffer, int *ret_buffer_len,
 	if (*ret_buffer_len < packet_len)
 		return (-1);
 
-	pkg_values_types = (uint8_t *) malloc (num_values * sizeof (uint8_t));
+	pkg_values_types = malloc (num_values * sizeof (*pkg_values_types));
 	if (pkg_values_types == NULL)
 	{
 		ERROR ("network plugin: write_part_values: malloc failed.");
 		return (-1);
 	}
 
-	pkg_values = (value_t *) malloc (num_values * sizeof (value_t));
+	pkg_values = malloc (num_values * sizeof (*pkg_values));
 	if (pkg_values == NULL)
 	{
 		free (pkg_values_types);
@@ -934,7 +930,7 @@ static int parse_part_string (void **ret_buffer, size_t *ret_buffer_len,
 	uint16_t pkg_length;
 	size_t payload_size;
 
-	if (output_len <= 0)
+	if (output_len == 0)
 		return (EINVAL);
 
 	if (buffer_len < header_size)
@@ -1369,7 +1365,7 @@ static int parse_part_encr_aes256 (sockent_t *se, /* {{{ */
     warning_has_been_printed = 1;
   }
 
-  *ret_buffer += ph_length;
+  *ret_buffer = (void *) (((char *) *ret_buffer) + ph_length);
   *ret_buffer_size -= ph_length;
 
   return (0);
@@ -1408,7 +1404,7 @@ static int parse_packet (sockent_t *se, /* {{{ */
 				(void *) buffer,
 				sizeof (pkg_type));
 		memcpy ((void *) &pkg_length,
-				(void *) (buffer + sizeof (pkg_type)),
+				(void *) (((char *) buffer) + sizeof (pkg_type)),
 				sizeof (pkg_length));
 
 		pkg_length = ntohs (pkg_length);
@@ -2012,10 +2008,9 @@ static sockent_t *sockent_create (int type) /* {{{ */
 	if ((type != SOCKENT_TYPE_CLIENT) && (type != SOCKENT_TYPE_SERVER))
 		return (NULL);
 
-	se = malloc (sizeof (*se));
+	se = calloc (1, sizeof (*se));
 	if (se == NULL)
 		return (NULL);
-	memset (se, 0, sizeof (*se));
 
 	se->type = type;
 	se->node = NULL;
@@ -2196,16 +2191,15 @@ static int sockent_client_connect (sockent_t *se) /* {{{ */
 			continue;
 		}
 
-		client->addr = malloc (sizeof (*client->addr));
+		client->addr = calloc (1, sizeof (*client->addr));
 		if (client->addr == NULL)
 		{
-			ERROR ("network plugin: malloc failed.");
+			ERROR ("network plugin: calloc failed.");
 			close (client->fd);
 			client->fd = -1;
 			continue;
 		}
 
-		memset (client->addr, 0, sizeof (*client->addr));
 		assert (sizeof (*client->addr) >= ai_ptr->ai_addrlen);
 		memcpy (client->addr, ai_ptr->ai_addr, ai_ptr->ai_addrlen);
 		client->addrlen = ai_ptr->ai_addrlen;
@@ -2313,7 +2307,7 @@ static int sockent_server_listen (sockent_t *se) /* {{{ */
 
 	freeaddrinfo (ai_list);
 
-	if (se->data.server.fd_num <= 0)
+	if (se->data.server.fd_num == 0)
 		return (-1);
 	return (0);
 } /* }}} int sockent_server_listen */
@@ -2495,14 +2489,14 @@ static int network_receive (void) /* {{{ */
 			 * these entries in the dispatch thread but put them in
 			 * another list, so we don't have to allocate more and
 			 * more of these structures. */
-			ent = malloc (sizeof (receive_list_entry_t));
+			ent = calloc (1, sizeof (*ent));
 			if (ent == NULL)
 			{
-				ERROR ("network plugin: malloc failed.");
+				ERROR ("network plugin: calloc failed.");
 				status = ENOMEM;
 				break;
 			}
-			memset (ent, 0, sizeof (receive_list_entry_t));
+
 			ent->data = malloc (network_config_packet_size);
 			if (ent->data == NULL)
 			{