Changeset 3065 for box/trunk/lib

Timestamp:

22/01/2012 16:28:01 (4 months ago)

Author:

chris

Message:

Log messages on failure to read, write, stat, seek and close files, with the filename.

File:

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

box/trunk/lib/common/FileStream.cpp

@@ -191 +191 @@
         else
         {
-                BOX_LOG_WIN_ERROR("Failed to read from file: " << mFileName);
-                r = -1;
+                THROW_WIN_FILE_ERROR("Failed to read from file", mFileName,
+                        CommonException, OSFileReadError);
+        }
+
+        if(r == -1)
+        {
+                THROW_EXCEPTION(CommonException, OSFileReadError)
         }
 #else
@@ -198 +203 @@
         if(r == -1)
         {
-                BOX_LOG_SYS_ERROR("Failed to read from file: " << mFileName);
-        }
-#endif
-
-        if(r == -1)
-        {
-                THROW_EXCEPTION(CommonException, OSFileReadError)
-        }
+                THROW_SYS_FILE_ERROR("Failed to read from file", mFileName,
+                        CommonException, OSFileReadError);
+        }
+#endif
 
         if(r == 0)
@@ -229 +230 @@
         if(EMU_FSTAT(mOSFileHandle, &st) != 0)
         {
-                THROW_EXCEPTION(CommonException, OSFileError)
+                BOX_LOG_SYS_ERROR(BOX_FILE_MESSAGE("Failed to stat file", mFileName));
         }
         
@@ -263 +264 @@
         if ((res == 0) || (numBytesWritten != (DWORD)NBytes))
         {
-                // DWORD err = GetLastError();
-                THROW_EXCEPTION(CommonException, OSFileWriteError)
+                THROW_WIN_FILE_ERROR("Failed to write to file", mFileName,
+                        CommonException, OSFileWriteError);
         }
 #else
         if(::write(mOSFileHandle, pBuffer, NBytes) != NBytes)
         {
-                BOX_LOG_SYS_ERROR("Failed to write to file: " << mFileName);
-                THROW_EXCEPTION(CommonException, OSFileWriteError)
+                THROW_SYS_FILE_ERROR("Failed to write to file", mFileName,
+                        CommonException, OSFileWriteError);
         }
 #endif
@@ -293 +294 @@
 #ifdef WIN32
         LARGE_INTEGER conv;
-
         conv.HighPart = 0;
-        conv.LowPart = 0;
-
         conv.LowPart = SetFilePointer(this->mOSFileHandle, 0, &conv.HighPart, FILE_CURRENT);
+
+        if(conv.LowPart == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR)
+        {
+                THROW_WIN_FILE_ERROR("Failed to seek in file", mFileName,
+                        CommonException, OSFileError);
+        }
 
         return (IOStream::pos_type)conv.QuadPart;
@@ -304 +308 @@
         if(p == -1)
         {
-                THROW_EXCEPTION(CommonException, OSFileError)
+                THROW_SYS_FILE_ERROR("Failed to seek in file", mFileName,
+                        CommonException, OSFileError);
         }
         
@@ -329 +334 @@
 #ifdef WIN32
         LARGE_INTEGER conv;
-
         conv.QuadPart = Offset;
         DWORD retVal = SetFilePointer(this->mOSFileHandle, conv.LowPart, &conv.HighPart, ConvertSeekTypeToOSWhence(SeekType));
@@ -335 +339 @@
         if(retVal == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR)
         {
-                THROW_EXCEPTION(CommonException, OSFileError)
+                THROW_WIN_FILE_ERROR("Failed to seek in file", mFileName,
+                        CommonException, OSFileError);
         }
 #else // ! WIN32
         if(::lseek(mOSFileHandle, Offset, ConvertSeekTypeToOSWhence(SeekType)) == -1)
         {
-                THROW_EXCEPTION(CommonException, OSFileError)
+                THROW_SYS_FILE_ERROR("Failed to seek in file", mFileName,
+                        CommonException, OSFileError);
         }
 #endif // WIN32
@@ -366 +372 @@
 #ifdef WIN32
         if(::CloseHandle(mOSFileHandle) == 0)
-#else
+        {
+                THROW_WIN_FILE_ERROR("Failed to close file", mFileName,
+                        CommonException, OSFileCloseError);
+        }
+#else // ! WIN32
         if(::close(mOSFileHandle) != 0)
-#endif
-        {
-                THROW_EXCEPTION(CommonException, OSFileCloseError)
-        }
+        {
+                THROW_SYS_FILE_ERROR("Failed to close file", mFileName,
+                        CommonException, OSFileCloseError);
+        }
+#endif // WIN32
 
         mOSFileHandle = INVALID_FILE;