[Box Backup-commit] COMMIT r2400 - box/trunk/lib/common

[boxbackup-dev@boxbackup.org]

Author: chris
Date: 2008-12-05 20:36:21 +0000 (Fri, 05 Dec 2008)
New Revision: 2400

Modified:
   box/trunk/lib/common/Logging.h
Log:
Add BOX_LOG_NATIVE_ERROR and BOX_LOG_NATIVE_WARNING macros, which call
BOX_LOG_SYS_* or BOX_LOG_WIN_* depending on platform, as this is a
common reason for #ifdefs elsewhere in the code.

Add BOX_LOG_SOCKET_ERROR macro to log socket errors with the type,
name and port of the socket that suffered the error.


Modified: box/trunk/lib/common/Logging.h
===================================================================
--- box/trunk/lib/common/Logging.h	2008-12-05 20:32:50 UTC (rev 2399)
+++ box/trunk/lib/common/Logging.h	2008-12-05 20:36:21 UTC (rev 2400)
@@ -67,8 +67,17 @@
 		BOX_ERROR(stuff << ": " << GetErrorMessage(number))
 	#define BOX_LOG_WIN_WARNING_NUMBER(stuff, number) \
 		BOX_WARNING(stuff << ": " << GetErrorMessage(number))
+	#define BOX_LOG_NATIVE_ERROR(stuff)   BOX_LOG_WIN_ERROR(stuff)
+	#define BOX_LOG_NATIVE_WARNING(stuff) BOX_LOG_WIN_WARNING(stuff)
+#else
+	#define BOX_LOG_NATIVE_ERROR(stuff)   BOX_LOG_SYS_ERROR(stuff)
+	#define BOX_LOG_NATIVE_WARNING(stuff) BOX_LOG_SYS_WARNING(stuff)
 #endif
 
+#define BOX_LOG_SOCKET_ERROR(_type, _name, _port, stuff) \
+	BOX_LOG_NATIVE_ERROR(stuff << " (type " << _type << ", name " << \
+		_name << ", port " << _port << ")")
+
 #define BOX_FORMAT_HEX32(number) \
 	std::hex << \
 	std::showbase << \