summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/helperfuncs.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index d11a13aa0..c097b0033 100644
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -424,19 +424,22 @@ unsigned long InspIRCd::Duration(const std::string &str)
return total + subtotal;
}
-const char* InspIRCd::Format(const char* formatString, ...)
+const char* InspIRCd::Format(const 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())
formatBuffer.resize(formatBuffer.size() * 2);
- va_end(vaList);
return &formatBuffer[0];
}
+const char* InspIRCd::Format(const char* formatString, ...)
+{
+ const char* ret;
+ VAFORMAT(ret, formatString, formatString);
+ return ret;
+}
+
bool InspIRCd::ULine(const std::string& sserver)
{
if (sserver.empty())