all: cleanups

src/util/snprintf.cpp

@@ -31,6 +31,15 @@
 // UPX version of string functions, with assertions and sane limits
 **************************************************************************/
 
+upx_rsize_t upx_safe_strlen(const char *s) {
+#undef strlen
+    assert(s != nullptr);
+    size_t len = strlen(s);
+    assert(len < UPX_RSIZE_MAX_STR);
+    return len;
+#define strlen upx_safe_strlen
+}
+
 int upx_safe_vsnprintf(char *str, upx_rsize_t max_size, const char *format, va_list ap) {
 #undef vsnprintf
     size_t size;
@@ -114,13 +123,4 @@ char *upx_safe_xprintf(const char *format, ...) {
     return ptr;
 }
 
-upx_rsize_t upx_safe_strlen(const char *s) {
-#undef strlen
-    assert(s != nullptr);
-    size_t len = strlen(s);
-    assert(len < UPX_RSIZE_MAX_STR);
-    return len;
-#define strlen upx_safe_strlen
-}
-
 /* vim:set ts=4 sw=4 et: */