From 4fca88ed02c1f0b5208abf2420f73023de54c23e Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris+github@qwirx.com>
Date: Fri, 28 Mar 2008 22:18:44 +0000
Subject: 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.
---
 lib/common/EventWatchFilesystemObject.cpp | 43 +++++++++++++++++--------------
 1 file changed, 24 insertions(+), 19 deletions(-)

(limited to 'lib/common/EventWatchFilesystemObject.cpp')

diff --git a/lib/common/EventWatchFilesystemObject.cpp b/lib/common/EventWatchFilesystemObject.cpp
index 84781113..43533fc8 100644
--- a/lib/common/EventWatchFilesystemObject.cpp
+++ b/lib/common/EventWatchFilesystemObject.cpp
@@ -26,9 +26,10 @@
 // --------------------------------------------------------------------------
 //
 // Function
-//		Name:    EventWatchFilesystemObject::EventWatchFilesystemObject(const char *)
-//		Purpose: Constructor -- opens the file object
-//		Created: 12/3/04
+//	Name:    EventWatchFilesystemObject::EventWatchFilesystemObject
+//		 (const char *)
+//	Purpose: Constructor -- opens the file object
+//	Created: 12/3/04
 //
 // --------------------------------------------------------------------------
 EventWatchFilesystemObject::EventWatchFilesystemObject(const char *Filename)
@@ -39,9 +40,8 @@ EventWatchFilesystemObject::EventWatchFilesystemObject(const char *Filename)
 #ifdef HAVE_KQUEUE
 	if(mDescriptor == -1)
 	{
-		BOX_ERROR("EventWatchFilesystemObject: "
-			"Failed to open file '" << Filename << "': " <<
-			strerror(errno));
+		BOX_LOG_SYS_ERROR("EventWatchFilesystemObject: "
+			"Failed to open file '" << Filename << "'");
 		THROW_EXCEPTION(CommonException, OSFileOpenError)
 	}
 #else
@@ -53,9 +53,9 @@ EventWatchFilesystemObject::EventWatchFilesystemObject(const char *Filename)
 // --------------------------------------------------------------------------
 //
 // Function
-//		Name:    EventWatchFilesystemObject::~EventWatchFilesystemObject()
-//		Purpose: Destructor
-//		Created: 12/3/04
+//	Name:    EventWatchFilesystemObject::~EventWatchFilesystemObject()
+//	Purpose: Destructor
+//	Created: 12/3/04
 //
 // --------------------------------------------------------------------------
 EventWatchFilesystemObject::~EventWatchFilesystemObject()
@@ -70,12 +70,14 @@ EventWatchFilesystemObject::~EventWatchFilesystemObject()
 // --------------------------------------------------------------------------
 //
 // Function
-//		Name:    EventWatchFilesystemObject::EventWatchFilesystemObject(const EventWatchFilesystemObject &)
-//		Purpose: Copy constructor
-//		Created: 12/3/04
+//	Name:    EventWatchFilesystemObject::EventWatchFilesystemObject
+//		 (const EventWatchFilesystemObject &)
+//	Purpose: Copy constructor
+//	Created: 12/3/04
 //
 // --------------------------------------------------------------------------
-EventWatchFilesystemObject::EventWatchFilesystemObject(const EventWatchFilesystemObject &rToCopy)
+EventWatchFilesystemObject::EventWatchFilesystemObject(
+	const EventWatchFilesystemObject &rToCopy)
 	: mDescriptor(::dup(rToCopy.mDescriptor))
 {
 	if(mDescriptor == -1)
@@ -89,17 +91,20 @@ EventWatchFilesystemObject::EventWatchFilesystemObject(const EventWatchFilesyste
 // --------------------------------------------------------------------------
 //
 // Function
-//		Name:    EventWatchFilesystemObject::FillInKEvent(struct kevent &, int)
-//		Purpose: For WaitForEvent
-//		Created: 12/3/04
+//	Name:    EventWatchFilesystemObject::FillInKEvent(struct kevent &, int)
+//	Purpose: For WaitForEvent
+//	Created: 12/3/04
 //
 // --------------------------------------------------------------------------
-void EventWatchFilesystemObject::FillInKEvent(struct kevent &rEvent, int Flags) const
+void EventWatchFilesystemObject::FillInKEvent(struct kevent &rEvent,
+	int Flags) const
 {
-	EV_SET(&rEvent, mDescriptor, EVFILT_VNODE, EV_CLEAR, NOTE_DELETE | NOTE_WRITE, 0, (void*)this);
+	EV_SET(&rEvent, mDescriptor, EVFILT_VNODE, EV_CLEAR,
+		NOTE_DELETE | NOTE_WRITE, 0, (void*)this);
 }
 #else
-void EventWatchFilesystemObject::FillInPoll(int &fd, short &events, int Flags) const
+void EventWatchFilesystemObject::FillInPoll(int &fd, short &events,
+	int Flags) const
 {
 	THROW_EXCEPTION(CommonException, KQueueNotSupportedOnThisPlatform)
 }
-- 
cgit v1.2.3