X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fapcups.c;h=c948f5a165b8b5f14d298601de99c90a4cc045e2;hb=7e44a991736f5b26f035711bb9296a176722edaf;hp=174febe45f5a5346124d7ad97ec83890cc964bda;hpb=939a113b288dfdee7df2263c682d27d7146c6013;p=collectd.git

diff --git a/src/apcups.c b/src/apcups.c
index 174febe4..c948f5a1 100644
--- a/src/apcups.c
+++ b/src/apcups.c
@@ -112,7 +112,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;
@@ -262,8 +262,6 @@ static int apc_query_server (char *host, int port,
 	char   *key;
 	double  value;
 
-	static complain_t compl;
-
 #if APCMAIN
 # define PRINT_VALUE(name, val) printf("  Found property: name = %s; value = %f;\n", name, val)
 #else
@@ -272,17 +270,13 @@ static int apc_query_server (char *host, int port,
 
 	if (global_sockfd < 0)
 	{
-		if ((global_sockfd = net_open (host, NULL, port)) < 0)
+		global_sockfd = net_open (host, port);
+		if (global_sockfd < 0)
 		{
-			plugin_complain (LOG_ERR, &compl, "apcups plugin: "
-					"Connecting to the apcupsd failed.");
+			ERROR ("apcups plugin: Connecting to the "
+					"apcupsd failed.");
 			return (-1);
 		}
-		else
-		{
-			plugin_relief (LOG_NOTICE, &compl, "apcups plugin: "
-					"Connection re-established to the apcupsd.");
-		}
 	}
 
 	if (net_send (&global_sockfd, "status", 6) < 0)
@@ -293,7 +287,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);
@@ -379,9 +373,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);