ipmi plugin: Fix an off-by-one error.

[collectd.git] / src / ipmi.c

diff --git a/src/ipmi.c b/src/ipmi.c
index e219e89..f026c17 100644 (file)
--- a/src/ipmi.c
+++ b/src/ipmi.c
@@ -225,7 +225,7 @@ static int sensor_list_add (ipmi_sensor_t *sensor)
   ipmi_sensor_get_name (sensor, sensor_name, sizeof (sensor_name));
   sensor_name[sizeof (sensor_name) - 1] = 0;
 
-  len = DATA_MAX_NAME_LEN - strlen(sensor_name);
+  len = DATA_MAX_NAME_LEN - strlen(sensor_name) - 1;
   strncat(sensor_name, " ", len--);
   strncat(sensor_name, ipmi_entity_get_entity_id_string(ent), len);
 
@@ -237,7 +237,7 @@ static int sensor_list_add (ipmi_sensor_t *sensor)
     char *sensor_name_ptr_id = strstr (sensor_name, "(");
 
     sensor_name_ptr += 2;
-    len = DATA_MAX_NAME_LEN - strlen(sensor_name);
+    len = DATA_MAX_NAME_LEN - strlen(sensor_name) - 1;
     strncat(sensor_name, " ", len--);
     strncat(sensor_name, sensor_name_ptr_id, 
       MIN(sensor_name_ptr - sensor_name_ptr_id - 1, len));
@@ -494,7 +494,7 @@ static void domain_connection_change_handler (ipmi_domain_t *domain,
 {
   int status;
 
-  printf ("domain_connection_change_handler (domain = %p, err = %i, "
+  DEBUG ("domain_connection_change_handler (domain = %p, err = %i, "
       "conn_num = %u, port_num = %u, still_connected = %i, "
       "user_data = %p);\n",
       (void *) domain, err, conn_num, port_num, still_connected, user_data);
@@ -561,7 +561,7 @@ static void *thread_main (void *user_data)
   status = thread_init (&os_handler);
   if (status != 0)
   {
-    fprintf (stderr, "ipmi plugin: thread_init failed.\n");
+    ERROR ("ipmi plugin: thread_init failed.\n");
     return ((void *) -1);
   }