projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.5'
[collectd.git]
/
src
/
perl.c
diff --git
a/src/perl.c
b/src/perl.c
index
bb62267
..
4a76c0a
100644
(file)
--- a/
src/perl.c
+++ b/
src/perl.c
@@
-36,7
+36,7
@@
#include <EXTERN.h>
#include <perl.h>
#include <EXTERN.h>
#include <perl.h>
-#if __GNUC__
+#if
defined(COLLECT_DEBUG) && COLLECT_DEBUG && defined(__GNUC__) &&
__GNUC__
# pragma GCC poison sprintf
#endif
# pragma GCC poison sprintf
#endif
@@
-1092,7
+1092,7
@@
static XS (Collectd_plugin_log)
XSRETURN_EMPTY;
}
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) */
XSRETURN_YES;
} /* static XS (Collectd_plugin_log) */
@@
-1790,7
+1790,7
@@
static int perl_config (oconfig_item_t *ci)
for (i = 0; i < ci->children_num; ++i) {
oconfig_item_t *c = ci->children + i;
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;
if (NULL != perl_threads)
aTHX = PERL_GET_CONTEXT;
@@
-1806,7
+1806,10
@@
static int perl_config (oconfig_item_t *ci)
else if (0 == strcasecmp (c->key, "Plugin"))
current_status = perl_config_plugin (aTHX_ c);
else
else if (0 == strcasecmp (c->key, "Plugin"))
current_status = perl_config_plugin (aTHX_ c);
else
+ {
log_warn ("Ignoring unknown config key \"%s\".", c->key);
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) {
/* fatal error - it's up to perl_config_* to clean up */
if (0 > current_status) {