X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fperl.c;h=b5965d67c2386cc826502591cb202fe8e44ddd5b;hb=bc7992ed0693313a2b1fe282a5bf23f1cc9f8e42;hp=2946ab3abb39e1ddcf22d597c7d426854e9d4c9d;hpb=fd9c88963b04c9e9050a952ba0f018493e8b7638;p=collectd.git

diff --git a/src/perl.c b/src/perl.c
index 2946ab3a..b5965d67 100644
--- a/src/perl.c
+++ b/src/perl.c
@@ -640,9 +640,6 @@ static int pplugin_dispatch_values (pTHX_ HV *values)
 	if (NULL != (tmp = hv_fetch (values, "time", 4, 0))) {
 		list.time = (time_t)SvIV (*tmp);
 	}
-	else {
-		list.time = time (NULL);
-	}
 
 	if (NULL != (tmp = hv_fetch (values, "host", 4, 0))) {
 		sstrncpy (list.host, SvPV_nolen (*tmp), sizeof (list.host));
@@ -1092,7 +1089,7 @@ static XS (Collectd_plugin_log)
 		XSRETURN_EMPTY;
 	}
 
-	plugin_log (SvIV (ST (0)), SvPV_nolen (ST (1)));
+	plugin_log (SvIV (ST (0)), "%s", SvPV_nolen (ST (1)));
 	XSRETURN_YES;
 } /* static XS (Collectd_plugin_log) */
 
@@ -1790,7 +1787,7 @@ static int perl_config (oconfig_item_t *ci)
 
 	for (i = 0; i < ci->children_num; ++i) {
 		oconfig_item_t *c = ci->children + i;
-		int current_status;
+		int current_status = 0;
 
 		if (NULL != perl_threads)
 			aTHX = PERL_GET_CONTEXT;
@@ -1806,7 +1803,10 @@ static int perl_config (oconfig_item_t *ci)
 		else if (0 == strcasecmp (c->key, "Plugin"))
 			current_status = perl_config_plugin (aTHX_ c);
 		else
+		{
 			log_warn ("Ignoring unknown config key \"%s\".", c->key);
+			current_status = 0;
+		}
 
 		/* fatal error - it's up to perl_config_* to clean up */
 		if (0 > current_status) {