projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix unreachable clause where both tmp_plugin and tmp_plugin_instance are non-empty.
[collectd.git]
/
src
/
perl.c
diff --git
a/src/perl.c
b/src/perl.c
index
306d413
..
0a4ae71
100644
(file)
--- a/
src/perl.c
+++ b/
src/perl.c
@@
-33,21
+33,12
@@
/* do not automatically get the thread specific Perl interpreter */
#define PERL_NO_GET_CONTEXT
/* do not automatically get the thread specific Perl interpreter */
#define PERL_NO_GET_CONTEXT
-#define DONT_POISON_SPRINTF_YET 1
#include "collectd.h"
#include "collectd.h"
-
-#undef DONT_POISON_SPRINTF_YET
-
#include <stdbool.h>
#include <EXTERN.h>
#include <perl.h>
#include <stdbool.h>
#include <EXTERN.h>
#include <perl.h>
-#if defined(COLLECT_DEBUG) && COLLECT_DEBUG && defined(__GNUC__) && __GNUC__
-#undef sprintf
-#pragma GCC poison sprintf
-#endif
-
#include <XSUB.h>
/* Some versions of Perl define their own version of DEBUG... :-/ */
#include <XSUB.h>
/* Some versions of Perl define their own version of DEBUG... :-/ */
@@
-56,8
+47,8
@@
#endif /* DEBUG */
/* ... while we want the definition found in plugin.h. */
#endif /* DEBUG */
/* ... while we want the definition found in plugin.h. */
-#include "common.h"
#include "plugin.h"
#include "plugin.h"
+#include "utils/common/common.h"
#include "filter_chain.h"
#include "filter_chain.h"
@@
-872,9
+863,9
@@
static int oconfig_item2hv(pTHX_ oconfig_item_t *ci, HV *hash) {
static char *get_module_name(char *buf, size_t buf_len, const char *module) {
int status = 0;
if (base_name[0] == '\0')
static char *get_module_name(char *buf, size_t buf_len, const char *module) {
int status = 0;
if (base_name[0] == '\0')
- status = snprintf(buf, buf_len, "%s", module);
+ status = s
s
nprintf(buf, buf_len, "%s", module);
else
else
- status = snprintf(buf, buf_len, "%s::%s", base_name, module);
+ status = s
s
nprintf(buf, buf_len, "%s::%s", base_name, module);
if ((status < 0) || ((unsigned int)status >= buf_len))
return NULL;
return buf;
if ((status < 0) || ((unsigned int)status >= buf_len))
return NULL;
return buf;