diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp index 99442d4fe2a3a1d33ff1d48eab6d4566ab6c5b9a..f4f15685627e414d19b517ea2fb3e1de27821e51 100755 --- a/indra/llcommon/llstring.cpp +++ b/indra/llcommon/llstring.cpp @@ -630,22 +630,6 @@ std::string utf8str_removeCRLF(const std::string& utf8str) } #if LL_WINDOWS -// documentation moved to header. Phoenix 2007-11-27 -namespace snprintf_hack -{ - int snprintf(char *str, size_t size, const char *format, ...) - { - va_list args; - va_start(args, format); - - int num_written = _vsnprintf(str, size, format, args); /* Flawfinder: ignore */ - va_end(args); - - str[size-1] = '\0'; // always null terminate - return num_written; - } -} - std::string ll_convert_wide_to_string(const wchar_t* in, unsigned int code_page) { std::string out; diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h index 3bbdcae708f49e1122b50a23b8103487d53703a9..900329facc6a3d94cc389ebc37fd0b6002b2b56c 100755 --- a/indra/llcommon/llstring.h +++ b/indra/llcommon/llstring.h @@ -589,33 +589,6 @@ LL_COMMON_API std::string utf8str_removeCRLF(const std::string& utf8str); */ //@{ -/** - * @brief Implementation the expected snprintf interface. - * - * If the size of the passed in buffer is not large enough to hold the string, - * two bad things happen: - * 1. resulting formatted string is NOT null terminated - * 2. Depending on the platform, the return value could be a) the required - * size of the buffer to copy the entire formatted string or b) -1. - * On Windows with VS.Net 2003, it returns -1 e.g. - * - * safe_snprintf always adds a NULL terminator so that the caller does not - * need to check for return value or need to add the NULL terminator. - * It does not, however change the return value - to let the caller know - * that the passed in buffer size was not large enough to hold the - * formatted string. - * - */ -#if _MSC_VER <= 1800 -// Deal with the differeneces on Windows -namespace snprintf_hack -{ - LL_COMMON_API int snprintf(char *str, size_t size, const char *format, ...); -} - -using snprintf_hack::snprintf; -#endif - /** * @brief Convert a wide string to std::string *