X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=2626da6bbd6132518866946809e73fd181503909;hb=5cc9614e73a783dec7a8e0887a0435cf577eaad4;hp=d11a13aa0f57e78133aa09b70e47a00eb9f9b774;hpb=8f27fefa75e2952e7ab8757eb9fe4af4586817f0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index d11a13aa0..2626da6bb 100644
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -22,8 +22,6 @@
  */
 
 
-/* $Core */
-
 #ifdef _WIN32
 #define _CRT_RAND_S
 #include <stdlib.h>
@@ -38,7 +36,7 @@ std::string InspIRCd::GetServerDescription(const std::string& servername)
 {
 	std::string description;
 
-	FOREACH_MOD(I_OnGetServerDescription,OnGetServerDescription(servername,description));
+	FOREACH_MOD(OnGetServerDescription, (servername,description));
 
 	if (!description.empty())
 	{
@@ -116,12 +114,6 @@ void InspIRCd::SendError(const std::string &s)
 	}
 }
 
-/* return channel count */
-long InspIRCd::ChannelCount()
-{
-	return chanlist->size();
-}
-
 bool InspIRCd::IsValidMask(const std::string &mask)
 {
 	const char* dest = mask.c_str();
@@ -325,35 +317,13 @@ bool InspIRCd::IsSID(const std::string &str)
 			 ((str[2] >= 'A' && str[2] <= 'Z') || isdigit(str[2])));
 }
 
-/* open the proper logfile */
-bool InspIRCd::OpenLog(char**, int)
-{
-	if (!Config->cmdline.writelog) return true; // Skip opening default log if -nolog
-
-	if (Config->cmdline.startup_log.empty())
-		Config->cmdline.startup_log = LOG_PATH "/startup.log";
-	FILE* startup = fopen(Config->cmdline.startup_log.c_str(), "a+");
-
-	if (!startup)
-	{
-		return false;
-	}
-
-	FileWriter* fw = new FileWriter(startup);
-	FileLogStream *f = new FileLogStream((Config->cmdline.forcedebug ? LOG_DEBUG : LOG_DEFAULT), fw);
-
-	this->Logs->AddLogType("*", f, true);
-
-	return true;
-}
-
 void InspIRCd::CheckRoot()
 {
 #ifndef _WIN32
 	if (geteuid() == 0)
 	{
 		std::cout << "ERROR: You are running an irc server as root! DO NOT DO THIS!" << std::endl << std::endl;
-		this->Logs->Log("STARTUP",LOG_DEFAULT,"Can't start as root");
+		this->Logs->Log("STARTUP", LOG_DEFAULT, "Can't start as root");
 		Exit(EXIT_STATUS_ROOT);
 	}
 #endif
@@ -372,13 +342,9 @@ void InspIRCd::SendWhoisLine(User* user, User* dest, int numeric, const std::str
 
 void InspIRCd::SendWhoisLine(User* user, User* dest, int numeric, const char* format, ...)
 {
-	char textbuffer[MAXBUF];
-	va_list argsPtr;
-	va_start (argsPtr, format);
-	vsnprintf(textbuffer, MAXBUF, format, argsPtr);
-	va_end(argsPtr);
-
-	this->SendWhoisLine(user, dest, numeric, std::string(textbuffer));
+	std::string textbuffer;
+	VAFORMAT(textbuffer, format, format)
+	this->SendWhoisLine(user, dest, numeric, textbuffer);
 }
 
 /** Refactored by Brain, Jun 2009. Much faster with some clever O(1) array
@@ -424,17 +390,32 @@ unsigned long InspIRCd::Duration(const std::string &str)
 	return total + subtotal;
 }
 
-const char* InspIRCd::Format(const char* formatString, ...)
+const char* InspIRCd::Format(va_list &vaList, const char* formatString)
 {
 	static std::vector<char> formatBuffer(1024);
-	int vsnret = 0;
 
-	va_list vaList;
-	va_start(vaList, formatString);
-	while ((vsnret = vsnprintf(&formatBuffer[0], formatBuffer.size(), formatString, vaList)) < 0 || static_cast<unsigned int>(vsnret) >= formatBuffer.size())
+	while (true)
+	{
+		va_list dst;
+		va_copy(dst, vaList);
+
+		int vsnret = vsnprintf(&formatBuffer[0], formatBuffer.size(), formatString, dst);
+		if (vsnret > 0 && static_cast<unsigned>(vsnret) < formatBuffer.size())
+		{
+			return &formatBuffer[0];
+		}
+
 		formatBuffer.resize(formatBuffer.size() * 2);
-	va_end(vaList);
-	return &formatBuffer[0];
+	}
+
+	throw CoreException();
+}
+
+const char* InspIRCd::Format(const char* formatString, ...)
+{
+	const char* ret;
+	VAFORMAT(ret, formatString, formatString);
+	return ret;
 }
 
 bool InspIRCd::ULine(const std::string& sserver)