X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fdaemon%2Fcommon.c;h=9da47755034038ebc0025343b9e3b55a6b2f1796;hb=362a519e00d50fc3657d485135075f753ec71bab;hp=7b7353d96685d60b8bbe8fd951fb35f6e67b13cb;hpb=43aca8ed8b22a7a5a14f8c740948d6ce06efbc95;p=collectd.git

diff --git a/src/daemon/common.c b/src/daemon/common.c
index 7b7353d9..9da47755 100644
--- a/src/daemon/common.c
+++ b/src/daemon/common.c
@@ -36,10 +36,6 @@
 #include "plugin.h"
 #include "utils_cache.h"
 
-#if HAVE_PTHREAD_H
-# include <pthread.h>
-#endif
-
 #ifdef HAVE_MATH_H
 # include <math.h>
 #endif
@@ -275,6 +271,9 @@ ssize_t swrite (int fd, const void *buf, size_t count)
 	ptr   = (const char *) buf;
 	nleft = count;
 	
+	if (fd < 0)
+		return (-1);
+
 	/* checking for closed peer connection */
 	pfd.fd = fd;
 	pfd.events = POLLIN | POLLHUP;
@@ -335,7 +334,7 @@ int strjoin (char *buffer, size_t buffer_size,
 	size_t sep_len;
 	size_t i;
 
-	if ((buffer_size < 1) || (fields_num <= 0))
+	if ((buffer_size < 1) || (fields_num == 0))
 		return (-1);
 
 	memset (buffer, 0, buffer_size);
@@ -373,27 +372,6 @@ int strjoin (char *buffer, size_t buffer_size,
 	return ((int) strlen (buffer));
 }
 
-int strsubstitute (char *str, char c_from, char c_to)
-{
-	int ret;
-
-	if (str == NULL)
-		return (-1);
-
-	ret = 0;
-	while (*str != '\0')
-	{
-		if (*str == c_from)
-		{
-			*str = c_to;
-			ret++;
-		}
-		str++;
-	}
-
-	return (ret);
-} /* int strsubstitute */
-
 int escape_string (char *buffer, size_t buffer_size)
 {
   char *temp;
@@ -1540,7 +1518,7 @@ int service_name_to_port_number (const char *service_name)
 {
 	struct addrinfo *ai_list;
 	struct addrinfo *ai_ptr;
-	struct addrinfo ai_hints;
+	struct addrinfo ai_hints = { 0 };
 	int status;
 	int service_number;
 
@@ -1548,7 +1526,6 @@ int service_name_to_port_number (const char *service_name)
 		return (-1);
 
 	ai_list = NULL;
-	memset (&ai_hints, 0, sizeof (ai_hints));
 	ai_hints.ai_family = AF_UNSPEC;
 
 	status = getaddrinfo (/* node = */ NULL, service_name,