Changeset 1016 for trunk

Timestamp:

Jun 8, 2008, 4:48:01 PM (16 years ago)

Author:

gah

Message:

 

Location:

trunk/src2/core

Files:

• Outcome.cpp (modified) (4 diffs)
• Outcome.h (modified) (1 diff)

trunk/src2/core/Outcome.cpp

@@ -12 +12 @@
 #include "Outcome.h"
 
+#include <stdarg.h>
+
 using namespace Rappture;
 
@@ -17 +19 @@
  *  Create a negative outcome, with the given error message.
  */
-Outcome::Outcome(const char *errmsg)
-  : _status(0),
+Outcome::Outcome(const char *errmsg) : 
+    _status(0),
     _remarkPtr(NULL),
     _contextPtr(NULL)
@@ -28 +30 @@
 
 /// Copy constructor
-Outcome::Outcome(const Outcome& oc)
-  : _status(oc._status),
+Outcome::Outcome(const Outcome& oc) : 
+    _status(oc._status),
     _remarkPtr(oc._remarkPtr),
     _contextPtr(oc._contextPtr)
@@ -58 +60 @@
     _remarkPtr = Ptr<std::string>(new std::string(errmsg));
     _contextPtr.clear();
+    return *this;
+}
+
+Outcome&
+Outcome::AddError(const char* format, ...)
+{
+    char stackSpace[1024];
+    va_list lst;
+    size_t n;
+    char *bufPtr;
+
+    va_start(lst, format);
+    bufPtr = stackSpace;
+    n = vsnprintf(bufPtr, 1024, format, lst);
+    if (n >= 1024) {
+        bufPtr = (char *)malloc(n);
+        vsnprintf(bufPtr, n, format, lst);
+    }
+    if (_remarkPtr.isNull()) {
+        _remarkPtr = Ptr<std::string>(new std::string(bufPtr));
+    } else {
+        _remarkPtr->append("\n");
+        _remarkPtr->append(bufPtr);
+    }
+    _contextPtr.clear();
+    _status = 1;                /* Set to error */
+    if (bufPtr != stackSpace) {
+        free(bufPtr);
+    }
     return *this;
 }

trunk/src2/core/Outcome.h

@@ -30 +30 @@
     virtual ~Outcome();
 
+    Outcome& AddError(const char* format, ...);
     virtual Outcome& error(const char* errmsg, int status=1);
     virtual Outcome& clear();