X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Finspircd.h;h=f3208dec23ee38976124b725d9b57ad74c4af369;hb=5ad9b97fcff193ebce91a923c5006632501abf97;hp=c37658515531ee236e071ce296fe092d4ec9449a;hpb=e586aaab7c4f7b03514c83451d73b73f55dc6998;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/inspircd.h b/include/inspircd.h
index c37658515..f3208dec2 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -246,10 +246,10 @@ public:
 	void SendTo(LocalUser* user);
 };
 
-DEFINE_HANDLER2(IsNickHandler, bool, const std::string&, size_t);
+DEFINE_HANDLER1(IsNickHandler, bool, const std::string&);
 DEFINE_HANDLER2(GenRandomHandler, void, char*, size_t);
 DEFINE_HANDLER1(IsIdentHandler, bool, const std::string&);
-DEFINE_HANDLER2(IsChannelHandler, bool, const std::string&, size_t);
+DEFINE_HANDLER1(IsChannelHandler, bool, const std::string&);
 DEFINE_HANDLER1(RehashHandler, void, const std::string&);
 DEFINE_HANDLER3(OnCheckExemptionHandler, ModResult, User*, Channel*, const std::string&);
 
@@ -324,8 +324,6 @@ class CoreExport InspIRCd
 	 */
 	FakeUser* FakeClient;
 
-	static const char LogHeader[];
-
 	/** Find a user in the UUID hash
 	 * @param uid The UUID to find
 	 * @return A pointer to the user, or NULL if the user does not exist
@@ -417,10 +415,6 @@ class CoreExport InspIRCd
 	 */
 	ProtocolInterface* PI;
 
-	/** Holds extensible for user nickforced
-	 */
-	LocalIntExt NICKForced;
-
 	/** Holds extensible for user operquit
 	 */
 	LocalStringExt OperQuit;
@@ -498,18 +492,11 @@ class CoreExport InspIRCd
 	 */
 	void CheckRoot();
 
-	/** Determine the right path for, and open, the logfile
-	 * @param argv The argv passed to main() initially, used to calculate program path
-	 * @param argc The argc passed to main() initially, used to calculate program path
-	 * @return True if the log could be opened, false if otherwise
-	 */
-	bool OpenLog(char** argv, int argc);
-
 	/** Return true if a channel name is valid
 	 * @param chname A channel name to verify
 	 * @return True if the name is valid
 	 */
-	caller2<bool, const std::string&, size_t> IsChannel;
+	caller1<bool, const std::string&> IsChannel;
 
 	/** Return true if str looks like a server ID
 	 * @param string to check against
@@ -541,6 +528,14 @@ class CoreExport InspIRCd
 	/** Causes the server to exit immediately with exit code 0.
 	 * The status code is required for signal handlers, and ignored.
 	 */
+
+	/** Printf-wrapper.
+	* @param How you want it formatted
+	* @param ...
+	* @return The formatted string
+	*/
+	static const char* Format(const char* formatString, ...);
+
 	static void QuickExit(int status);
 
 	/** Return a count of channels on the network
@@ -557,7 +552,7 @@ class CoreExport InspIRCd
 	 * @param n A nickname to verify
 	 * @return True if the nick is valid
 	 */
-	caller2<bool, const std::string&, size_t> IsNick;
+	caller1<bool, const std::string&> IsNick;
 
 	/** Return true if an ident is valid
 	 * @param An ident to verify