X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=inline;f=src%2Fdaemon%2Fcommon.c;h=4c271d347d90e9d3bc60a50b5b528939eea2b235;hb=7b64cc91d3307179557b25b6ece2349a088f4294;hp=aedf8b27ccfe1c090bea8d6dd80323666376edac;hpb=8101a5c5d1487bccf7922961ccb4dc54d92a761d;p=collectd.git

diff --git a/src/daemon/common.c b/src/daemon/common.c
index aedf8b27..4c271d34 100644
--- a/src/daemon/common.c
+++ b/src/daemon/common.c
@@ -36,9 +36,7 @@
 #include "plugin.h"
 #include "utils_cache.h"
 
-#if HAVE_PTHREAD_H
-# include <pthread.h>
-#endif
+#include <pthread.h>
 
 #ifdef HAVE_MATH_H
 # include <math.h>
@@ -275,6 +273,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 +336,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);