RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-04-03 16:21:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace the use of strncpy() and sprintf() with std::string and LLVM streams.

Browse Source 
Patch by Martinez, Javier E.

llvm-svn: 164822
This commit is contained in:
Dmitri Gribenko 2012-09-28 14:15:28 +00:00
parent 4193023537
commit 191c7dd7f5
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Support/Errno.cpp
View File

@ -13,6 +13,7 @@
#include "llvm/Support/Errno.h" #include "llvm/Support/Errno.h"
#include "llvm/Config/config.h" // Get autoconf configuration settings #include "llvm/Config/config.h" // Get autoconf configuration settings
#include "llvm/Support/raw_ostream.h"
#if HAVE_STRING_H #if HAVE_STRING_H
#include <string.h> #include <string.h>
@ -39,7 +40,7 @@ std::string StrError(int errnum) {
const int MaxErrStrLen = 2000; const int MaxErrStrLen = 2000;
char buffer[MaxErrStrLen]; char buffer[MaxErrStrLen];
buffer[0] = '\0'; buffer[0] = '\0';
char* str = buffer; std::string str;
#ifdef HAVE_STRERROR_R #ifdef HAVE_STRERROR_R
// strerror_r is thread-safe. // strerror_r is thread-safe.
if (errnum) if (errnum)
@ -49,6 +50,7 @@ std::string StrError(int errnum) {
str = strerror_r(errnum,buffer,MaxErrStrLen-1); str = strerror_r(errnum,buffer,MaxErrStrLen-1);
# else # else
strerror_r(errnum,buffer,MaxErrStrLen-1); strerror_r(errnum,buffer,MaxErrStrLen-1);
str = buffer;
# endif # endif
#elif HAVE_DECL_STRERROR_S // "Windows Secure API" #elif HAVE_DECL_STRERROR_S // "Windows Secure API"
if (errnum) if (errnum)
@ -58,12 +60,13 @@ std::string StrError(int errnum) {
// the buffer as fast as possible to minimize impact // the buffer as fast as possible to minimize impact
// of collision of strerror in multiple threads. // of collision of strerror in multiple threads.
if (errnum) if (errnum)
strncpy(buffer,strerror(errnum),MaxErrStrLen-1); str = strerror(errnum);
buffer[MaxErrStrLen-1] = '\0';
#else #else
// Strange that this system doesn't even have strerror // Strange that this system doesn't even have strerror
// but, oh well, just use a generic message // but, oh well, just use a generic message
sprintf(buffer, "Error #%d", errnum); raw_string_ostream stream(str);
stream << "Error #" << errnum;
stream.flush();
#endif #endif
return str; return str;
} }