Fix string_copy() macro to not multiple-eval args. Bug 2603

[exim.git] / src / src / functions.h

diff --git a/src/src/functions.h b/src/src/functions.h
index 0028deb0d6d2622aa0c8e88d463c6984e74df84d..0050cdeeb0db07ed0f941f2b8a36e2360598e75a 100644 (file)
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -767,9 +767,9 @@ string_copy_trc(const uschar * s, const char * func, int line)
 /* Simple string-copy functions maintaining the taint */
 
 #define string_copyn(s, len) \
-       string_copyn_taint_trc((s), (len), is_tainted(s), __FUNCTION__, __LINE__)
+       string_copyn_trc((s), (len), __FUNCTION__, __LINE__)
 #define string_copy(s) \
-       string_copy_taint_trc((s), is_tainted(s), __FUNCTION__, __LINE__)
+       string_copy_trc((s), __FUNCTION__, __LINE__)
 
 
 /*************************************************