projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
processes plugin: Add the `ProcessMatch' option.
[collectd.git]
/
src
/
apcups.c
diff --git
a/src/apcups.c
b/src/apcups.c
index
08df0b5
..
fb48109
100644
(file)
--- 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
*/
* 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;
{
int sd;
int status;
@@
-124,8
+124,7
@@
static int net_open (char *host, char *service, int port)
assert ((port > 0x00000000) && (port <= 0x0000FFFF));
/* Convert the port to a string */
assert ((port > 0x00000000) && (port <= 0x0000FFFF));
/* Convert the port to a string */
- snprintf (port_str, 8, "%i", port);
- port_str[7] = '\0';
+ ssnprintf (port_str, sizeof (port_str), "%i", port);
/* Resolve name */
memset ((void *) &ai_hints, '\0', sizeof (ai_hints));
/* Resolve name */
memset ((void *) &ai_hints, '\0', sizeof (ai_hints));
@@
-270,7
+269,7
@@
static int apc_query_server (char *host, int port,
if (global_sockfd < 0)
{
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 "
if (global_sockfd < 0)
{
ERROR ("apcups plugin: Connecting to the "
@@
-287,7
+286,7
@@
static int apc_query_server (char *host, int port,
while ((n = net_recv (&global_sockfd, recvline, sizeof (recvline) - 1)) > 0)
{
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);
recvline[n] = '\0';
#if APCMAIN
printf ("net_recv = `%s';\n", recvline);
@@
-376,9
+375,10
@@
static void apc_submit_generic (char *type, char *type_inst, double value)
strcpy (vl.host, hostname_g);
strcpy (vl.plugin, "apcups");
strcpy (vl.plugin_instance, "");
strcpy (vl.host, hostname_g);
strcpy (vl.plugin, "apcups");
strcpy (vl.plugin_instance, "");
- strncpy (vl.type_instance, type_inst, sizeof (vl.type_instance));
+ sstrncpy (vl.type, type, sizeof (vl.type));
+ sstrncpy (vl.type_instance, type_inst, sizeof (vl.type_instance));
- plugin_dispatch_values (
type,
&vl);
+ plugin_dispatch_values (&vl);
}
static void apc_submit (struct apc_detail_s *apcups_detail)
}
static void apc_submit (struct apc_detail_s *apcups_detail)