Packets: Fix VariantParser invalid parser access bug

[senf.git] / Utils / Exception.cci

diff --git a/Utils/Exception.cci b/Utils/Exception.cci
index a9830b5..189c2f1 100644 (file)
--- a/Utils/Exception.cci
+++ b/Utils/Exception.cci
@@ -21,20 +21,86 @@
     \brief Exception inline non-template implementation */
 
 // Custom includes
+#include <errno.h>
+#include <cstring>
 
 #define prefix_ inline
 ///////////////////////////////cci.p///////////////////////////////////////
 
-prefix_  senf::SystemException::SystemException(int err_)
-    : where(0), err(err_)
+///////////////////////////////////////////////////////////////////////////
+// senf::ExceptionMixin
+
+prefix_ senf::ExceptionMixin::ExceptionMixin(std::string const & description)
+    : message_(description)
+{
+#ifdef SENF_DEBUG
+    addBacktrace();
+#endif
+}
+
+prefix_ std::string const & senf::ExceptionMixin::message()
+    const
+{
+    return message_;
+}
+
+prefix_ void senf::ExceptionMixin::append(std::string text)
+{
+    message_ += text;
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::Exception
+
+prefix_ senf::Exception::Exception(std::string const & description)
+    : ExceptionMixin(description)
+{}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::SystemException
+
+prefix_ senf::SystemException::SystemException(std::string const & descr _SENF_EXC_DEBUG_ARGS_ND)
+{
+    init(descr, errno _SENF_EXC_DEBUG_ARGS_P);
+}
+
+prefix_ senf::SystemException::SystemException(int code _SENF_EXC_DEBUG_ARGS_ND)
+{
+    init("", code _SENF_EXC_DEBUG_ARGS_P);
+}
+
+prefix_ senf::SystemException::SystemException(std::string const & descr, int code 
+                                               _SENF_EXC_DEBUG_ARGS_ND)
+{
+    init(descr, code _SENF_EXC_DEBUG_ARGS_P);
+}
+
+prefix_ int senf::SystemException::errorNumber()
+    const
+{
+    return code_;
+}
+
+prefix_ char const * senf::SystemException::errorString()
+    const
 {
-    init();
+    return std::strerror(code_);
 }
 
-prefix_ senf::SystemException::SystemException(char const * where_, int err_)
-    : where(where_), err(err_)
+prefix_ bool senf::SystemException::anyOf(int c0, int c1, int c2, int c3, int c4, int c5,
+                                          int c6, int c7, int c8, int c9)
 {
-    init();
+    return 
+        (c0 && code_ == c0) ||
+        (c1 && code_ == c1) ||
+        (c2 && code_ == c2) ||
+        (c3 && code_ == c3) ||
+        (c4 && code_ == c4) ||
+        (c5 && code_ == c5) ||
+        (c6 && code_ == c6) ||
+        (c7 && code_ == c7) ||
+        (c8 && code_ == c8) ||
+        (c9 && code_ == c9);
 }
 
 prefix_  senf::SystemException::~SystemException()
@@ -52,4 +118,5 @@ prefix_  senf::SystemException::~SystemException()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End: