For Bug 543:

Allow the ThrowErrno function to optionally accept an error number
parameter so that callers can specify the error number to be used.

llvm-svn: 21384
This commit is contained in:
Reid Spencer 2005-04-21 02:30:32 +00:00
parent 2f72bafb60
commit b02566dc1c
1 changed files with 8 additions and 6 deletions

View File

@ -66,24 +66,26 @@
# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) # define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
#endif #endif
inline void ThrowErrno(const std::string& prefix) { inline void ThrowErrno(const std::string& prefix, int errnum = -1) {
char buffer[MAXPATHLEN]; char buffer[MAXPATHLEN];
buffer[0] = 0; buffer[0] = 0;
if (errnum == -1)
errnum = errno;
#ifdef HAVE_STRERROR_R #ifdef HAVE_STRERROR_R
// strerror_r is thread-safe. // strerror_r is thread-safe.
if (errno) if (errnum)
strerror_r(errno,buffer,MAXPATHLEN-1); strerror_r(errnum,buffer,MAXPATHLEN-1);
#elif HAVE_STRERROR #elif HAVE_STRERROR
// Copy the thread un-safe result of strerror into // Copy the thread un-safe result of strerror into
// 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 (errno) if (errnum)
strncpy(buffer,strerror(errno),MAXPATHLEN-1); strncpy(buffer,strerror(errnum),MAXPATHLEN-1);
buffer[MAXPATHLEN-1] = 0; buffer[MAXPATHLEN-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", errno); sprintf(buffer, "Error #%d", errnum);
#endif #endif
throw prefix + ": " + buffer; throw prefix + ": " + buffer;
} }