From 03aee2e3f2e349dd7a15fbaa4e5492f7b075b69b Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Thu, 21 Apr 2005 02:30:32 +0000 Subject: [PATCH] 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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@21384 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/System/Unix/Unix.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/System/Unix/Unix.h b/lib/System/Unix/Unix.h index 2f57b68c8eb..741a817f454 100644 --- a/lib/System/Unix/Unix.h +++ b/lib/System/Unix/Unix.h @@ -66,24 +66,26 @@ # define WIFEXITED(stat_val) (((stat_val) & 255) == 0) #endif -inline void ThrowErrno(const std::string& prefix) { +inline void ThrowErrno(const std::string& prefix, int errnum = -1) { char buffer[MAXPATHLEN]; buffer[0] = 0; + if (errnum == -1) + errnum = errno; #ifdef HAVE_STRERROR_R // strerror_r is thread-safe. - if (errno) - strerror_r(errno,buffer,MAXPATHLEN-1); + if (errnum) + strerror_r(errnum,buffer,MAXPATHLEN-1); #elif HAVE_STRERROR // Copy the thread un-safe result of strerror into // the buffer as fast as possible to minimize impact // of collision of strerror in multiple threads. - if (errno) - strncpy(buffer,strerror(errno),MAXPATHLEN-1); + if (errnum) + strncpy(buffer,strerror(errnum),MAXPATHLEN-1); buffer[MAXPATHLEN-1] = 0; #else // Strange that this system doesn't even have strerror // but, oh well, just use a generic message - sprintf(buffer, "Error #%d", errno); + sprintf(buffer, "Error #%d", errnum); #endif throw prefix + ": " + buffer; }