X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fapache.c;h=7667f247604b330ace7f4426aef9d659a139c05c;hb=ec9abb566017d406745f5f263b55792f89cede1a;hp=55d8cd479976481cf03aaf2abdd021491b857f09;hpb=2354eda94fa44c8bcb8e39b24b117e7937110224;p=collectd.git

diff --git a/src/apache.c b/src/apache.c
index 55d8cd47..7667f247 100644
--- a/src/apache.c
+++ b/src/apache.c
@@ -146,7 +146,7 @@ static int init (void)
 	{
 		int status;
 
-		status = snprintf (credentials, sizeof (credentials), "%s:%s",
+		status = ssnprintf (credentials, sizeof (credentials), "%s:%s",
 				user, (pass == NULL) ? "" : pass);
 		if (status >= sizeof (credentials))
 		{
@@ -155,7 +155,6 @@ static int init (void)
 					"truncated.");
 			return (-1);
 		}
-		credentials[sizeof (credentials) - 1] = '\0';
 
 		curl_easy_setopt (curl, CURLOPT_USERPWD, credentials);
 	}
@@ -202,14 +201,11 @@ static void submit_counter (const char *type, const char *type_instance,
 	strcpy (vl.host, hostname_g);
 	strcpy (vl.plugin, "apache");
 	strcpy (vl.plugin_instance, "");
-	strncpy (vl.type, type, sizeof (vl.type));
+	sstrncpy (vl.type, type, sizeof (vl.type));
 
 	if (type_instance != NULL)
-	{
-		strncpy (vl.type_instance, type_instance,
+		sstrncpy (vl.type_instance, type_instance,
 				sizeof (vl.type_instance));
-		vl.type_instance[sizeof (vl.type_instance) - 1] = '\0';
-	}
 
 	plugin_dispatch_values (&vl);
 } /* void submit_counter */
@@ -228,14 +224,11 @@ static void submit_gauge (const char *type, const char *type_instance,
 	strcpy (vl.host, hostname_g);
 	strcpy (vl.plugin, "apache");
 	strcpy (vl.plugin_instance, "");
-	strncpy (vl.type, type, sizeof (vl.type));
+	sstrncpy (vl.type, type, sizeof (vl.type));
 
 	if (type_instance != NULL)
-	{
-		strncpy (vl.type_instance, type_instance,
+		sstrncpy (vl.type_instance, type_instance,
 				sizeof (vl.type_instance));
-		vl.type_instance[sizeof (vl.type_instance) - 1] = '\0';
-	}
 
 	plugin_dispatch_values (&vl);
 } /* void submit_counter */