Implement strdupnull() macro as static inline function.

This avoids compiler warnings if the argument is a const char*.

diff --git a/src/libstrongswan/utils.h b/src/libstrongswan/utils.h
index 6334b8e010aa28b3f8394801703bc26787c18b20..aeaa4e74b7f4dd6838b04189dce1110a1501c986 100644 (file)
--- a/src/libstrongswan/utils.h
+++ b/src/libstrongswan/utils.h
@@ -74,7 +74,10 @@
 /**
  * NULL-safe strdup variant
  */
-#define strdupnull(x) ({ char *_x = x; _x ? strdup(_x) : NULL; })
+static inline char *strdupnull(const char *s)
+{
+       return s ? strdup(s) : NULL;
+}
 
 /**
  * Macro compares two binary blobs for equality