[cig-commits] r11420 - cs/benchmark/cigma/trunk/src

[luis at geodynamics.org]

Author: luis
Date: 2008-03-12 11:03:16 -0700 (Wed, 12 Mar 2008)
New Revision: 11420

Modified:
   cs/benchmark/cigma/trunk/src/TextWriter.cpp
   cs/benchmark/cigma/trunk/src/TextWriter.h
   cs/benchmark/cigma/trunk/src/VtkWriter.cpp
   cs/benchmark/cigma/trunk/src/VtkWriter.h
   cs/benchmark/cigma/trunk/src/Writer.h
Log:
Changed virtual method Writer::open() to return error code


Modified: cs/benchmark/cigma/trunk/src/TextWriter.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/TextWriter.cpp	2008-03-12 18:03:14 UTC (rev 11419)
+++ cs/benchmark/cigma/trunk/src/TextWriter.cpp	2008-03-12 18:03:16 UTC (rev 11420)
@@ -15,7 +15,7 @@
 
 // ---------------------------------------------------------------------------
 
-void cigma::TextWriter::open(std::string filename)
+int cigma::TextWriter::open(std::string filename)
 {
     fp = NULL;
 
@@ -28,7 +28,11 @@
         fp = stdout;
     }
 
-    assert(fp != NULL); // XXX: use return value instead of assert
+    if (fp == NULL)
+    {
+        return -1;
+    }
+    return 0;
 }
 
 void cigma::TextWriter::close()

Modified: cs/benchmark/cigma/trunk/src/TextWriter.h
===================================================================
--- cs/benchmark/cigma/trunk/src/TextWriter.h	2008-03-12 18:03:14 UTC (rev 11419)
+++ cs/benchmark/cigma/trunk/src/TextWriter.h	2008-03-12 18:03:16 UTC (rev 11420)
@@ -21,7 +21,7 @@
 
 public:
     WriterType getType() { return TXT_WRITER; }
-    void open(std::string filename);
+    int open(std::string filename);
     void close();
 
 public:

Modified: cs/benchmark/cigma/trunk/src/VtkWriter.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/VtkWriter.cpp	2008-03-12 18:03:14 UTC (rev 11419)
+++ cs/benchmark/cigma/trunk/src/VtkWriter.cpp	2008-03-12 18:03:16 UTC (rev 11420)
@@ -15,11 +15,15 @@
 
 // ---------------------------------------------------------------------------
 
-void cigma::VtkWriter::
+int cigma::VtkWriter::
 open(std::string filename)
 {
     fp = fopen(filename.c_str(), "w");
-    assert(fp != NULL);
+    if (fp == NULL)
+    {
+        return -1;
+    }
+    return 0;
 }
 
 void cigma::VtkWriter::

Modified: cs/benchmark/cigma/trunk/src/VtkWriter.h
===================================================================
--- cs/benchmark/cigma/trunk/src/VtkWriter.h	2008-03-12 18:03:14 UTC (rev 11419)
+++ cs/benchmark/cigma/trunk/src/VtkWriter.h	2008-03-12 18:03:16 UTC (rev 11420)
@@ -20,7 +20,7 @@
 
 public:
     WriterType getType() { return VTK_WRITER; }
-    void open(std::string filename);
+    int open(std::string filename);
     void close();
 
 public:

Modified: cs/benchmark/cigma/trunk/src/Writer.h
===================================================================
--- cs/benchmark/cigma/trunk/src/Writer.h	2008-03-12 18:03:14 UTC (rev 11419)
+++ cs/benchmark/cigma/trunk/src/Writer.h	2008-03-12 18:03:16 UTC (rev 11420)
@@ -29,7 +29,7 @@
 
 public:
     virtual WriterType getType() = 0;
-    virtual void open(std::string filename) = 0;
+    virtual int open(std::string filename) = 0;
     virtual void close() = 0;
 
 public: