all: cleanups

src/util/snprintf.h

@@ -49,6 +49,9 @@ char *upx_safe_xprintf(const char *format, ...) attribute_format(1, 2);
 upx_rsize_t upx_safe_strlen(const char *);
 
 // globally redirect some functions
+#undef strlen
+#define strlen upx_safe_strlen
+
 #undef snprintf
 #undef sprintf
 #undef vsnprintf
@@ -56,9 +59,6 @@ upx_rsize_t upx_safe_strlen(const char *);
 #define sprintf ERROR_sprintf_IS_DANGEROUS_USE_snprintf
 #define vsnprintf upx_safe_vsnprintf
 
-#undef strlen
-#define strlen upx_safe_strlen
-
 /*************************************************************************
 // some unsigned char string support functions to avoid casts
 **************************************************************************/