X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fapcups.c;h=462006a66a2a9447738ad60c060c2a3451c6e60f;hb=a019b6c8144745db63c599680bd693ac02f11666;hp=08df0b50fbcb2cb36253bd2c97f9019f689962bb;hpb=79b07973208a37d18818541ed6dcdaac8dc35e0f;p=collectd.git

diff --git a/src/apcups.c b/src/apcups.c
index 08df0b50..462006a6 100644
--- a/src/apcups.c
+++ b/src/apcups.c
@@ -24,13 +24,6 @@
  *   Anthony Gialluca <tonyabg at charter.net>
  **/
 
-/*
- * FIXME: Don't know why but without this here atof() was not returning
- * correct values for me. This is behavior that I don't understand and
- * should be examined in closer detail.
- */
-#include <stdlib.h>
-
 #include "collectd.h"
 #include "common.h"      /* rrd_update_file */
 #include "plugin.h"      /* plugin_register, plugin_submit */
@@ -112,7 +105,7 @@ static int apcups_shutdown (void)
  * Returns -1 on error
  * Returns socket file descriptor otherwise
  */
-static int net_open (char *host, char *service, int port)
+static int net_open (char *host, int port)
 {
 	int              sd;
 	int              status;
@@ -270,7 +263,7 @@ static int apc_query_server (char *host, int port,
 
 	if (global_sockfd < 0)
 	{
-		global_sockfd = net_open (host, NULL, port);
+		global_sockfd = net_open (host, port);
 		if (global_sockfd < 0)
 		{
 			ERROR ("apcups plugin: Connecting to the "
@@ -287,7 +280,7 @@ static int apc_query_server (char *host, int port,
 
 	while ((n = net_recv (&global_sockfd, recvline, sizeof (recvline) - 1)) > 0)
 	{
-		assert (n < sizeof (recvline));
+		assert ((unsigned int)n < sizeof (recvline));
 		recvline[n] = '\0';
 #if APCMAIN
 		printf ("net_recv = `%s';\n", recvline);
@@ -373,9 +366,9 @@ static void apc_submit_generic (char *type, char *type_inst, double value)
 	vl.values = values;
 	vl.values_len = 1;
 	vl.time = time (NULL);
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "apcups");
-	strcpy (vl.plugin_instance, "");
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "apcups", sizeof (vl.plugin));
+	sstrncpy (vl.plugin_instance, "", sizeof (vl.plugin_instance));
 	strncpy (vl.type_instance, type_inst, sizeof (vl.type_instance));
 
 	plugin_dispatch_values (type, &vl);