X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmemcached.c;h=ca93102f2a2865a9ab2b1bbb3919f7b1b064d272;hb=c28bc580c110c78741d0805c7652e05d994b0ff4;hp=a1825780ee1624ab7f4583bdf70295faef48a766;hpb=917abf10c462903cd3bb37faadba68f91f5ca8b1;p=collectd.git

diff --git a/src/memcached.c b/src/memcached.c
index a1825780..ca93102f 100644
--- a/src/memcached.c
+++ b/src/memcached.c
@@ -200,11 +200,10 @@ static int memcached_config (const char *key, const char *value) /* {{{ */
 	} else if (strcasecmp (key, "Port") == 0) {
 		int port = (int) (atof (value));
 		if ((port > 0) && (port <= 65535)) {
-			snprintf (memcached_port, sizeof (memcached_port), "%i", port);
+			ssnprintf (memcached_port, sizeof (memcached_port), "%i", port);
 		} else {
-			strncpy (memcached_port, value, sizeof (memcached_port));
+			sstrncpy (memcached_port, value, sizeof (memcached_port));
 		}
-		memcached_port[sizeof (memcached_port) - 1] = '\0';
 	} else {
 		return -1;
 	}
@@ -226,13 +225,11 @@ static void submit_counter (const char *type, const char *type_inst,
 	vl.time = time (NULL);
 	strcpy (vl.host, hostname_g);
 	strcpy (vl.plugin, "memcached");
+	sstrncpy (vl.type, type, sizeof (vl.type));
 	if (type_inst != NULL)
-	{
-		strncpy (vl.type_instance, type_inst, sizeof (vl.type_instance));
-		vl.type_instance[sizeof (vl.type_instance) - 1] = '\0';
-	}
+		sstrncpy (vl.type_instance, type_inst, sizeof (vl.type_instance));
 
-	plugin_dispatch_values (type, &vl);
+	plugin_dispatch_values (&vl);
 } /* void memcached_submit_cmd */
 /* }}} */
 
@@ -250,13 +247,11 @@ static void submit_counter2 (const char *type, const char *type_inst,
 	vl.time = time (NULL);
 	strcpy (vl.host, hostname_g);
 	strcpy (vl.plugin, "memcached");
+	sstrncpy (vl.type, type, sizeof (vl.type));
 	if (type_inst != NULL)
-	{
-		strncpy (vl.type_instance, type_inst, sizeof (vl.type_instance));
-		vl.type_instance[sizeof (vl.type_instance) - 1] = '\0';
-	}
+		sstrncpy (vl.type_instance, type_inst, sizeof (vl.type_instance));
 
-	plugin_dispatch_values (type, &vl);
+	plugin_dispatch_values (&vl);
 } /* void memcached_submit_cmd */
 /* }}} */
 
@@ -273,13 +268,11 @@ static void submit_gauge (const char *type, const char *type_inst,
 	vl.time = time (NULL);
 	strcpy (vl.host, hostname_g);
 	strcpy (vl.plugin, "memcached");
+	sstrncpy (vl.type, type, sizeof (vl.type));
 	if (type_inst != NULL)
-	{
-		strncpy (vl.type_instance, type_inst, sizeof (vl.type_instance));
-		vl.type_instance[sizeof (vl.type_instance) - 1] = '\0';
-	}
+		sstrncpy (vl.type_instance, type_inst, sizeof (vl.type_instance));
 
-	plugin_dispatch_values (type, &vl);
+	plugin_dispatch_values (&vl);
 }
 /* }}} */
 
@@ -297,13 +290,11 @@ static void submit_gauge2 (const char *type, const char *type_inst,
 	vl.time = time (NULL);
 	strcpy (vl.host, hostname_g);
 	strcpy (vl.plugin, "memcached");
+	sstrncpy (vl.type, type, sizeof (vl.type));
 	if (type_inst != NULL)
-	{
-		strncpy (vl.type_instance, type_inst, sizeof (vl.type_instance));
-		vl.type_instance[sizeof (vl.type_instance) - 1] = '\0';
-	}
+		sstrncpy (vl.type_instance, type_inst, sizeof (vl.type_instance));
 
-	plugin_dispatch_values (type, &vl);
+	plugin_dispatch_values (&vl);
 }
 /* }}} */