X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmbmon.c;h=344caddffd91f286b94b96721d065b4c2751f652;hb=7e905b5dbb59d0ba43503896daf2a8dbf102eaba;hp=384ecb5e6a5cda48d376ebea8b5aad3882a1143b;hpb=0f0dd3b00845209b865862c073813caf44d01ae8;p=collectd.git diff --git a/src/mbmon.c b/src/mbmon.c index 384ecb5e..344caddf 100644 --- a/src/mbmon.c +++ b/src/mbmon.c @@ -132,7 +132,7 @@ static int mbmon_query_daemon (char *buffer, int buffer_size) if (connect (fd, (struct sockaddr *) ai_ptr->ai_addr, ai_ptr->ai_addrlen)) { char errbuf[1024]; - DEBUG ("mbmon: connect (%s, %s): %s", host, port, + INFO ("mbmon: connect (%s, %s): %s", host, port, sstrerror (errno, errbuf, sizeof (errbuf))); close (fd); @@ -228,11 +228,12 @@ static void mbmon_submit (const char *type, const char *type_instance, vl.values = values; vl.values_len = 1; vl.time = time (NULL); - strcpy (vl.host, hostname_g); - strcpy (vl.plugin, "mbmon"); - strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance)); + sstrncpy (vl.host, hostname_g, sizeof (vl.host)); + sstrncpy (vl.plugin, "mbmon", sizeof (vl.plugin)); + sstrncpy (vl.type, type, sizeof (vl.type)); + sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance)); - plugin_dispatch_values (type, &vl); + plugin_dispatch_values (&vl); } /* void mbmon_submit */ /* Trim trailing whitespace from a string. */ @@ -240,7 +241,7 @@ static void trim_spaces (char *s) { size_t l; - for (l = strlen (s) - 1; (l > 0) && isspace (s[l]); l--) + for (l = strlen (s) - 1; (l > 0) && isspace ((int) s[l]); l--) s[l] = '\0'; }