Changeset 2115 for box/trunk/lib/common/FileStream.cpp

Timestamp:

28/03/2008 22:18:44 (4 years ago)

Author:

chris

Message:

Improve logging with macros that consistently output strerror(errno) and
errno, replacing almost all use of strerror() in the main code.

Log a more detailed error message before throwing an exception for some
more system call failures.

Make FileStream? store its filename on all platforms, not just Windows.

Wrap some long lines at less than 80 characters to improve readability.

Fix some minor violations of coding standard (white space) and a typo
in a comment.

File:

• box/trunk/lib/common/FileStream.cpp (modified) (6 diffs)

box/trunk/lib/common/FileStream.cpp

@@ -31 +31 @@
         : mOSFileHandle(::open(Filename, flags, mode)),
 #endif
-          mIsEOF(false)
+          mIsEOF(false),
+          mFileName(Filename)
 {
 #ifdef WIN32
@@ -50 +51 @@
                 }
         }
-#ifdef WIN32
-        this->fileName = Filename;
-#endif
 }
 
@@ -66 +64 @@
 FileStream::FileStream(tOSFileHandle FileDescriptor)
         : mOSFileHandle(FileDescriptor),
-          mIsEOF(false)
+          mIsEOF(false),
+          mFileName("HANDLE")
 {
 #ifdef WIN32
@@ -78 +77 @@
                 THROW_EXCEPTION(CommonException, OSFileOpenError)
         }
-#ifdef WIN32
-        this->fileName = "HANDLE";
-#endif
 }
 
@@ -151 +147 @@
                 );
 
-        if ( valid )
+        if(valid)
         {
                 r = numBytesRead;
         }
-        else if (GetLastError() == ERROR_BROKEN_PIPE)
+        else if(GetLastError() == ERROR_BROKEN_PIPE)
         {
                 r = 0;
@@ -161 +157 @@
         else
         {
-                BOX_ERROR("Failed to read from file: " <<
-                        GetErrorMessage(GetLastError()));
+                BOX_LOG_WIN_ERROR("Failed to read from file: " << mFileName);
                 r = -1;
         }
 #else
         int r = ::read(mOSFileHandle, pBuffer, NBytes);
-#endif
         if(r == -1)
         {
+                BOX_LOG_SYS_ERROR("Failed to read from file: " << mFileName);
+        }
+#endif
+
+        if(r == -1)
+        {
                 THROW_EXCEPTION(CommonException, OSFileReadError)
         }
+
         if(r == 0)
         {