X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=e331ba9dc6c9b2bf980df1ba1607dd94602c5b01;hb=48a400f2e068527b338ceecf8ed1dde2da971ca9;hp=c29e7d2cc65e6d7bfd28897a2be68b2f4a23640c;hpb=4f3aaaef9f8b111452ffa4498aaefeae3fcb6675;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index c29e7d2cc..e331ba9dc 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -331,7 +331,7 @@ unsigned long InspIRCd::Duration(const std::string &str) return total + subtotal; } -const char* InspIRCd::Format(va_list &vaList, const char* formatString) +std::string InspIRCd::Format(va_list& vaList, const char* formatString) { static std::vector formatBuffer(1024); @@ -351,12 +351,12 @@ const char* InspIRCd::Format(va_list &vaList, const char* formatString) formatBuffer.resize(formatBuffer.size() * 2); } - return &formatBuffer[0]; + return std::string(&formatBuffer[0]); } -const char* InspIRCd::Format(const char* formatString, ...) +std::string InspIRCd::Format(const char* formatString, ...) { - const char* ret; + std::string ret; VAFORMAT(ret, formatString, formatString); return ret; }