update(internal/utils): Removing macro for PRINT(F)

Author: skuzzis

src/common.h

@@ -79,7 +79,7 @@ void PrintToClientOrConsole(CPlayerSlot *slot, std::string category, std::string
         PRINTF(category, message, args...);
     else
         CLIENT_PRINTF(*slot, category, message, args...);
-};
+}
 
 bool ends_with(std::string value, std::string ending);
 bool starts_with(std::string value, std::string starting);

src/utils.cpp

@@ -0,0 +1,33 @@
+#include "common.h"
+#include "utils.h"
+#include <cstdarg>
+
+size_t UTIL_FormatArgs(char *buffer, size_t maxlength, const char *fmt, va_list params)
+{
+    size_t len = vsnprintf(buffer, maxlength, fmt, params);
+
+    if (len >= maxlength)
+    {
+        len = maxlength - 1;
+        buffer[len] = '\0';
+    }
+
+    return len;
+}
+
+void PLUGIN_PRINT(std::string category, std::string str)
+{
+    g_SMAPI->ConPrint((PREFIX " [" + category + "] " + str).c_str());
+}
+
+void PLUGIN_PRINTF(std::string category, std::string str, ...)
+{
+    va_list ap;
+    char buffer[4096];
+
+    va_start(ap, str);
+    UTIL_FormatArgs(buffer, sizeof(buffer), str.c_str(), ap);
+    va_end(ap);
+
+    g_SMAPI->ConPrint((PREFIX " [" + category + "] " + std::string(buffer)).c_str());
+}

src/utils.h

@@ -11,8 +11,11 @@
 
 #define GCC_COMPILER (defined(__GNUC__) && !defined(__clang__))
 
-#define PRINT(CATEGORY, FORMAT_STR) g_SMAPI->ConPrint(std::string(PREFIX).append(" [").append(CATEGORY).append("] ").append(FORMAT_STR).c_str())
-#define PRINTF(CATEGORY, FORMAT_STR, ...) g_SMAPI->ConPrintf(std::string(PREFIX).append(" [").append(CATEGORY).append("] ").append(FORMAT_STR).c_str(), __VA_ARGS__)
+void PLUGIN_PRINT(std::string category, std::string str);
+void PLUGIN_PRINTF(std::string category, std::string str, ...);
+
+#define PRINT PLUGIN_PRINT
+#define PRINTF PLUGIN_PRINTF
 #define PRINTRET(CATEGORY, FORMAT_STR, RET) \
     {                                       \
         PRINT(CATEGORY, FORMAT_STR);        \