Added macro to allow simpler logic in functions with the need to vsnprintf

[user/henk/code/inspircd.git] / include / inspircd.h

diff --git a/include/inspircd.h b/include/inspircd.h
index ed6f7df94fa3284517e6fa66f6dae9a0b236ddf9..de574b6f41e2c0b7557e38a077c75d41adc099a0 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -417,10 +417,6 @@ class CoreExport InspIRCd
         */
        ProtocolInterface* PI;
 
-       /** Holds extensible for user nickforced
-        */
-       LocalIntExt NICKForced;
-
        /** Holds extensible for user operquit
         */
        LocalStringExt OperQuit;
@@ -547,7 +543,8 @@ class CoreExport InspIRCd
        * @param ...
        * @return The formatted string
        */
-       static const char* Format(const char* formatString, ...);
+       static const char* Format(const char* formatString, ...) CUSTOM_PRINTF(1, 2);
+       static const char* Format(const va_list &vaList, const char* formatString) CUSTOM_PRINTF(2, 0);
 
        static void QuickExit(int status);