summaryrefslogtreecommitdiff
path: root/lib/common
diff options
context:
space:
mode:
authorChris Wilson <chris+github@qwirx.com>2011-01-12 00:10:45 +0000
committerChris Wilson <chris+github@qwirx.com>2011-01-12 00:10:45 +0000
commitbc6ccea0d973ce4a0eb370191c3bbcd22d6cb45b (patch)
tree4fd2858a3224c69034c8ca6165d2d00649cb39ff /lib/common
parentff316251a1b9f169dcb39227c0229c709f3be77d (diff)
Add some more logging and exception macros. Refactor to reduce nesting
depth and increase modularity.
Diffstat (limited to 'lib/common')
-rw-r--r--lib/common/Logging.h40
1 files changed, 29 insertions, 11 deletions
diff --git a/lib/common/Logging.h b/lib/common/Logging.h
index bdcfc291..47045a50 100644
--- a/lib/common/Logging.h
+++ b/lib/common/Logging.h
@@ -41,27 +41,45 @@
if (Logging::IsEnabled(Log::TRACE)) \
{ BOX_LOG(Log::TRACE, stuff) }
-#define BOX_SYS_ERROR(stuff) \
- stuff << ": " << std::strerror(errno) << " (" << errno << ")"
+#define BOX_SYS_ERRNO_MESSAGE(error_number, stuff) \
+ stuff << ": " << std::strerror(error_number) << " (" << errno << ")"
+
+#define BOX_FILE_MESSAGE(filename, message) \
+ message << ": " << filename
+
+#define BOX_SYS_FILE_ERRNO_MESSAGE(filename, error_number, message) \
+ BOX_SYS_ERRNO_MESSAGE(error_number, BOX_FILE_MESSAGE(filename, message))
+
+#define BOX_SYS_ERROR_MESSAGE(stuff) \
+ BOX_SYS_ERRNO_MESSAGE(errno, stuff)
#define BOX_LOG_SYS_WARNING(stuff) \
- BOX_WARNING(BOX_SYS_ERROR(stuff))
+ BOX_WARNING(BOX_SYS_ERROR_MESSAGE(stuff))
#define BOX_LOG_SYS_ERROR(stuff) \
- BOX_ERROR(BOX_SYS_ERROR(stuff))
+ BOX_ERROR(BOX_SYS_ERROR_MESSAGE(stuff))
+#define BOX_LOG_SYS_ERRNO(error_number, stuff) \
+ BOX_ERROR(BOX_SYS_ERRNO_MESSAGE(error_number, stuff))
#define BOX_LOG_SYS_FATAL(stuff) \
- BOX_FATAL(BOX_SYS_ERROR(stuff))
+ BOX_FATAL(BOX_SYS_ERROR_MESSAGE(stuff))
-#define THROW_SYS_ERROR(message, exception, subtype) \
- BOX_LOG_SYS_ERROR(message); \
+#define THROW_SYS_ERROR_NUMBER(message, error_number, exception, subtype) \
THROW_EXCEPTION_MESSAGE(exception, subtype, \
- BOX_SYS_ERROR(message))
+ BOX_SYS_ERRNO_MESSAGE(error_number, message))
+
+#define THROW_SYS_ERROR(message, exception, subtype) \
+ THROW_SYS_ERROR_NUMBER(message, errno, exception, subtype)
#define THROW_SYS_FILE_ERROR(message, filename, exception, subtype) \
- THROW_SYS_ERROR(message << ": " << filename, exception, subtype)
+ THROW_SYS_ERROR_NUMBER(BOX_FILE_MESSAGE(filename, message), \
+ errno, exception, subtype)
+
+#define THROW_SYS_FILE_ERRNO(message, filename, error_number, exception, subtype) \
+ THROW_SYS_ERROR_NUMBER(BOX_FILE_MESSAGE(filename, message), \
+ error_number, exception, subtype)
#define THROW_FILE_ERROR(message, filename, exception, subtype) \
- BOX_ERROR(message << ": " << filename); \
- THROW_EXCEPTION_MESSAGE(exception, subtype, message << ": " << filename);
+ THROW_EXCEPTION_MESSAGE(exception, subtype, \
+ BOX_FILE_MESSAGE(filename, message))
inline std::string GetNativeErrorMessage()
{