src/collectd.h: Poison various insecure string functions only when debugging is enabled.

Because the `poison' pragma complains about macros (which are then never
used), this feature does more harm than good in everyday use. So we'll
only activate it when building in debug mode, so hopefully authors of
new plugins will use this.

diff --git a/src/collectd.h b/src/collectd.h
index eece4203894b1a51786446b6787fba77f152d944..895413a701004d879108dda020a9c59e22bf4934 100644 (file)
--- a/src/collectd.h
+++ b/src/collectd.h
@@ -247,7 +247,7 @@
 # define __attribute__(x) /**/
 #endif
 
-#if __GNUC__
+#if defined(COLLECT_DEBUG) && COLLECT_DEBUG && defined(__GNUC__) && __GNUC__
 # pragma GCC poison strcpy strcat strtok
 #endif
 
@@ -258,7 +258,7 @@
  * included.
  */
 #ifndef DONT_POISON_SPRINTF_YET
-# if __GNUC__
+# if defined(COLLECT_DEBUG) && COLLECT_DEBUG && defined(__GNUC__) && __GNUC__
 #  pragma GCC poison sprintf
 # endif
 #endif

diff --git a/src/perl.c b/src/perl.c
index 2a8180d2231d71e64fedbe55f5c197b87327195d..3df11a3d594096ec7ca3d63b8877adbe77654c26 100644 (file)
--- a/src/perl.c
+++ b/src/perl.c
@@ -36,7 +36,7 @@
 #include <EXTERN.h>
 #include <perl.h>
 
-#if __GNUC__
+#if defined(COLLECT_DEBUG) && COLLECT_DEBUG && defined(__GNUC__) && __GNUC__
 # pragma GCC poison sprintf
 #endif